summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2014-11-05 21:57:38 +0100
committerLukas Pioch <lukas@zgow.de>2014-11-05 21:57:38 +0100
commit13b20d6fe29ebccc60b6be0d3baa17e0353f4a06 (patch)
tree4782bcbc065945d9d94351c7803caa9e8763e5c1 /src
parentSimplified FindAndDoWithUUID, formatted line (diff)
downloadcuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar.gz
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar.bz2
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar.lz
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar.xz
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.tar.zst
cuberite-13b20d6fe29ebccc60b6be0d3baa17e0353f4a06.zip
Diffstat (limited to '')
-rw-r--r--src/Bindings/ManualBindings.cpp4
-rw-r--r--src/Root.cpp4
-rw-r--r--src/Root.h4
-rw-r--r--src/World.cpp5
-rw-r--r--src/World.h4
5 files changed, 11 insertions, 10 deletions
diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp
index 5343090d9..3d10e2abb 100644
--- a/src/Bindings/ManualBindings.cpp
+++ b/src/Bindings/ManualBindings.cpp
@@ -3368,7 +3368,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
tolua_beginmodule(tolua_S, "cRoot");
tolua_function(tolua_S, "FindAndDoWithPlayer", tolua_DoWith <cRoot, cPlayer, &cRoot::FindAndDoWithPlayer>);
- tolua_function(tolua_S, "FindAndDoWithUUID", tolua_DoWith <cRoot, cPlayer, &cRoot::FindAndDoWithUUID>);
+ tolua_function(tolua_S, "DoWithPlayerByUUID", tolua_DoWith <cRoot, cPlayer, &cRoot::DoWithPlayerByUUID>);
tolua_function(tolua_S, "ForEachPlayer", tolua_ForEach<cRoot, cPlayer, &cRoot::ForEachPlayer>);
tolua_function(tolua_S, "ForEachWorld", tolua_ForEach<cRoot, cWorld, &cRoot::ForEachWorld>);
tolua_function(tolua_S, "GetFurnaceRecipe", tolua_cRoot_GetFurnaceRecipe);
@@ -3390,7 +3390,7 @@ void ManualBindings::Bind(lua_State * tolua_S)
tolua_function(tolua_S, "DoWithFlowerPotAt", tolua_DoWithXYZ<cWorld, cFlowerPotEntity, &cWorld::DoWithFlowerPotAt>);
tolua_function(tolua_S, "DoWithPlayer", tolua_DoWith< cWorld, cPlayer, &cWorld::DoWithPlayer>);
tolua_function(tolua_S, "FindAndDoWithPlayer", tolua_DoWith< cWorld, cPlayer, &cWorld::FindAndDoWithPlayer>);
- tolua_function(tolua_S, "FindAndDoWithUUID", tolua_DoWith< cWorld, cPlayer, &cWorld::FindAndDoWithUUID>);
+ tolua_function(tolua_S, "DoWithPlayerByUUID", tolua_DoWith< cWorld, cPlayer, &cWorld::DoWithPlayerByUUID>);
tolua_function(tolua_S, "ForEachBlockEntityInChunk", tolua_ForEachInChunk<cWorld, cBlockEntity, &cWorld::ForEachBlockEntityInChunk>);
tolua_function(tolua_S, "ForEachChestInChunk", tolua_ForEachInChunk<cWorld, cChestEntity, &cWorld::ForEachChestInChunk>);
tolua_function(tolua_S, "ForEachEntity", tolua_ForEach< cWorld, cEntity, &cWorld::ForEachEntity>);
diff --git a/src/Root.cpp b/src/Root.cpp
index 539284665..49d6117eb 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -633,11 +633,11 @@ bool cRoot::FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallbac
-bool cRoot::FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
+bool cRoot::DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
{
for (WorldMap::iterator itr = m_WorldsByName.begin(); itr != m_WorldsByName.end();itr++)
{
- if (itr->second->FindAndDoWithUUID(a_PlayerUUID, a_Callback))
+ if (itr->second->DoWithPlayerByUUID(a_PlayerUUID, a_Callback))
{
return true;
}
diff --git a/src/Root.h b/src/Root.h
index f0cdf14d1..618f70fb8 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -126,8 +126,8 @@ public:
/// Finds a player from a partial or complete player name and calls the callback - case-insensitive
bool FindAndDoWithPlayer(const AString & a_PlayerName, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
- /// Finds a player with the same uuid and call the callback
- bool FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
+ /** Finds the player over his uuid and calls the callback */
+ bool DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
// tolua_begin
diff --git a/src/World.cpp b/src/World.cpp
index 1b4f4f171..1954854f3 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2729,12 +2729,13 @@ bool cWorld::FindAndDoWithPlayer(const AString & a_PlayerNameHint, cPlayerListCa
-bool cWorld::FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
+bool cWorld::DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
{
cCSLock Lock(m_CSPlayers);
for (cPlayerList::iterator itr = m_Players.begin(); itr != m_Players.end(); ++itr)
{
- if ((*itr)->GetUUID() == a_PlayerUUID) { // Match found and exit
+ if ((*itr)->GetUUID() == a_PlayerUUID)
+ {
return a_Callback.Item (*itr);
}
}
diff --git a/src/World.h b/src/World.h
index aeb8abf81..f1bf9371a 100644
--- a/src/World.h
+++ b/src/World.h
@@ -323,8 +323,8 @@ public:
// TODO: This interface is dangerous - rewrite to DoWithClosestPlayer(pos, sight, action)
cPlayer * FindClosestPlayer(const Vector3d & a_Pos, float a_SightLimit, bool a_CheckLineOfSight = true);
- /** Finds a player with the same uuid and call the callback */
- bool FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
+ /** Finds the player over his uuid and calls the callback */
+ bool DoWithPlayerByUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
void SendPlayerList(cPlayer * a_DestPlayer); // Sends playerlist to the player