From 269d76a208fcfc58c3c79d6e6a887b823d4f8f00 Mon Sep 17 00:00:00 2001
From: Lukas Pioch <lukas@zgow.de>
Date: Sun, 2 Nov 2014 21:38:17 +0100
Subject: Simplified FindAndDoWithUUID, formatted line

---
 src/World.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/World.cpp')

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;
 }
 
-- 
cgit v1.2.3