summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Root.h2
-rw-r--r--src/World.cpp8
2 files changed, 2 insertions, 8 deletions
diff --git a/src/Root.h b/src/Root.h
index 456217140..f0cdf14d1 100644
--- a/src/Root.h
+++ b/src/Root.h
@@ -126,7 +126,7 @@ 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 */
+ /// Finds a player with the same uuid and call the callback
bool FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback); // >> EXPORTED IN MANUALBINDINGS <<
// tolua_begin
diff --git a/src/World.cpp b/src/World.cpp
index 212566194..1b4f4f171 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2731,19 +2731,13 @@ bool cWorld::FindAndDoWithPlayer(const AString & a_PlayerNameHint, cPlayerListCa
bool cWorld::FindAndDoWithUUID(const AString & a_PlayerUUID, cPlayerListCallback & a_Callback)
{
- cPlayer * FoundPlayer = nullptr;
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
- FoundPlayer = *itr;
- break;
+ return a_Callback.Item (*itr);
}
}
- if (FoundPlayer != nullptr)
- {
- return a_Callback.Item (FoundPlayer);
- }
return false;
}