From 95ce0c927ca11856ac270b7274c48b45850c6bcc Mon Sep 17 00:00:00 2001
From: Schmoozerd <schmoozerd@scriptdev2.com>
Date: Sun, 1 Apr 2012 04:52:14 +0200
Subject: [PATCH] [11938] Replace use of HashMapFolder.Find<Player> with
 ObjectAccessor::FindPlayer wrapper

---
 src/game/GroupHandler.cpp   | 4 ++--
 src/game/ObjectAccessor.cpp | 4 ++--
 src/shared/revision_nr.h    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 0a7dd564d..700248cf4 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -811,8 +811,8 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode( WorldPacket &recv_data )
     ObjectGuid guid;
     recv_data >> guid;
 
-    Player * player = HashMapHolder<Player>::Find(guid);
-    if(!player)
+    Player* player = ObjectAccessor::FindPlayer(guid, false);
+    if (!player)
     {
         WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
         data << uint8(0);                                   // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index d098d253c..8331e7467 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -78,7 +78,7 @@ Player* ObjectAccessor::FindPlayer(ObjectGuid guid, bool inWorld /*= true*/)
     if (!guid)
         return NULL;
 
-    Player* plr = HashMapHolder<Player>::Find(guid);;
+    Player* plr = HashMapHolder<Player>::Find(guid);
     if (!plr || (!plr->IsInWorld() && inWorld))
         return NULL;
 
@@ -107,7 +107,7 @@ ObjectAccessor::SaveAllPlayers()
 
 void ObjectAccessor::KickPlayer(ObjectGuid guid)
 {
-    if (Player* p = HashMapHolder<Player>::Find(guid))
+    if (Player* p = ObjectAccessor::FindPlayer(guid, false))
     {
         WorldSession* s = p->GetSession();
         s->KickPlayer();                            // mark session to remove at next session list update
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 291b40bb7..dd779d63a 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11937"
+ #define REVISION_NR "11938"
 #endif // __REVISION_NR_H__