1 files changed, 8 insertions, 10 deletions
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index b7e1c8d9..fa615824 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -22,8 +22,9 @@
 #include "chatclient.h"
 #include "party.h"
 
-#include "account-server/storage.h"
+#include "account-server/character.h"
 #include "account-server/serverhandler.h"
+#include "account-server/storage.h"
 
 #include "common/manaserv_protocol.h"
 
@@ -32,10 +33,10 @@
 
 using namespace ManaServ;
 
-void updateInfo(ChatClient *client, int partyId)
+static void updateInfo(ChatClient *client, int partyId)
 {
-    CharacterData *character = storage->getCharacter(client->characterName);
-    GameServerHandler::sendPartyChange(character, partyId);
+    if (auto character = storage->getCharacter(client->characterName))
+        GameServerHandler::sendPartyChange(*character, partyId);
 }
 
 void ChatHandler::removeExpiredPartyInvites()
@@ -201,16 +202,13 @@ void ChatHandler::removeUserFromParty(ChatClient &client)
 
 void ChatHandler::informPartyMemberQuit(ChatClient &client)
 {
-    std::map<std::string, ChatClient*>::iterator itr;
-    std::map<std::string, ChatClient*>::const_iterator itr_end = mPlayerMap.end();
-
-    for (itr = mPlayerMap.begin(); itr != itr_end; ++itr)
+    for (auto& nameAndClient : mPlayerMap)
     {
-        if (itr->second->party == client.party)
+        if (nameAndClient.second->party == client.party)
         {
             MessageOut out(CPMSG_PARTY_MEMBER_LEFT);
             out.writeInt32(client.characterId);
-            itr->second->send(out);
+            nameAndClient.second->send(out);
         }
     }
 }