Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)

4 files changed, 27 insertions, 27 deletions

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 5119c473478..3f4927eb43d 100755
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -168,7 +168,7 @@ void Channel::Join(uint64 p, const char *pass)
         return;
     }
 
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
 
     if (plr)
     {
@@ -230,7 +230,7 @@ void Channel::Leave(uint64 p, bool send)
     }
     else
     {
-        Player *plr = sObjectMgr->GetPlayer(p);
+        Player *plr = ObjectAccessor::FindPlayer(p);
 
         if (send)
         {
@@ -273,7 +273,7 @@ void Channel::Leave(uint64 p, bool send)
 void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
 {
     AccountTypes sec = SEC_PLAYER;
-    Player *gplr = sObjectMgr->GetPlayer(good);
+    Player *gplr = ObjectAccessor::FindPlayer(good);
     if (gplr)
         sec = gplr->GetSession()->GetSecurity();
 
@@ -291,7 +291,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
     }
     else
     {
-        Player *bad = sObjectMgr->GetPlayer(badname);
+        Player *bad = sObjectAccessor->FindPlayerByName(badname);
         if (bad == NULL || !IsOn(bad->GetGUID()))
         {
             WorldPacket data;
@@ -337,7 +337,7 @@ void Channel::KickOrBan(uint64 good, const char *badname, bool ban)
 void Channel::UnBan(uint64 good, const char *badname)
 {
     uint32 sec = 0;
-    Player *gplr = sObjectMgr->GetPlayer(good);
+    Player *gplr = ObjectAccessor::FindPlayer(good);
     if (gplr)
         sec = gplr->GetSession()->GetSecurity();
 
@@ -355,7 +355,7 @@ void Channel::UnBan(uint64 good, const char *badname)
     }
     else
     {
-        Player *bad = sObjectMgr->GetPlayer(badname);
+        Player *bad = sObjectAccessor->FindPlayerByName(badname);
         if (bad == NULL || !IsBanned(bad->GetGUID()))
         {
             WorldPacket data;
@@ -379,7 +379,7 @@ void Channel::Password(uint64 p, const char *pass)
 {
     std::string plName;
     uint32 sec = 0;
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
     if (plr)
         sec = plr->GetSession()->GetSecurity();
 
@@ -411,7 +411,7 @@ void Channel::Password(uint64 p, const char *pass)
 
 void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
 {
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
     if (!plr)
         return;
 
@@ -431,7 +431,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
     }
     else
     {
-        Player *newp = sObjectMgr->GetPlayer(p2n);
+        Player *newp = sObjectAccessor->FindPlayerByName(p2n);
         if (!newp)
         {
             WorldPacket data;
@@ -479,7 +479,7 @@ void Channel::SetMode(uint64 p, const char *p2n, bool mod, bool set)
 
 void Channel::SetOwner(uint64 p, const char *newname)
 {
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
     if (!plr)
         return;
 
@@ -501,7 +501,7 @@ void Channel::SetOwner(uint64 p, const char *newname)
         return;
     }
 
-    Player *newp = sObjectMgr->GetPlayer(newname);
+    Player *newp = sObjectAccessor->FindPlayerByName(newname);
     if (newp == NULL || !IsOn(newp->GetGUID()))
     {
         WorldPacket data;
@@ -563,7 +563,7 @@ void Channel::List(Player* player)
         uint32 count  = 0;
         for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
         {
-            Player *plr = sObjectMgr->GetPlayer(i->first);
+            Player *plr = ObjectAccessor::FindPlayer(i->first);
 
             // PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
             // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
@@ -585,7 +585,7 @@ void Channel::List(Player* player)
 void Channel::Announce(uint64 p)
 {
     uint32 sec = 0;
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
     if (plr)
         sec = plr->GetSession()->GetSecurity();
 
@@ -623,7 +623,7 @@ void Channel::Say(uint64 p, const char *what, uint32 lang)
     if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_CHANNEL))
         lang = LANG_UNIVERSAL;
 
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
 
     if (!IsOn(p))
     {
@@ -666,7 +666,7 @@ void Channel::Invite(uint64 p, const char *newname)
         return;
     }
 
-    Player *newp = sObjectMgr->GetPlayer(newname);
+    Player *newp = sObjectAccessor->FindPlayerByName(newname);
     if (!newp)
     {
         WorldPacket data;
@@ -683,7 +683,7 @@ void Channel::Invite(uint64 p, const char *newname)
         return;
     }
 
-    Player *plr = sObjectMgr->GetPlayer(p);
+    Player *plr = ObjectAccessor::FindPlayer(p);
     if (!plr)
         return;
 
@@ -749,7 +749,7 @@ void Channel::SendToAll(WorldPacket *data, uint64 p)
 {
     for (PlayerList::const_iterator i = players.begin(); i != players.end(); ++i)
     {
-        Player *plr = sObjectMgr->GetPlayer(i->first);
+        Player *plr = ObjectAccessor::FindPlayer(i->first);
         if (plr)
         {
             if (!p || !plr->GetSocial()->HasIgnore(GUID_LOPART(p)))
@@ -764,7 +764,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
     {
         if (i->first != who)
         {
-            Player *plr = sObjectMgr->GetPlayer(i->first);
+            Player *plr = ObjectAccessor::FindPlayer(i->first);
             if (plr)
                 plr->GetSession()->SendPacket(data);
         }
@@ -773,7 +773,7 @@ void Channel::SendToAllButOne(WorldPacket *data, uint64 who)
 
 void Channel::SendToOne(WorldPacket *data, uint64 who)
 {
-    Player *plr = sObjectMgr->GetPlayer(who);
+    Player *plr = ObjectAccessor::FindPlayer(who);
     if (plr)
         plr->GetSession()->SendPacket(data);
 }
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 34c36ce21bb..d0146184eae 100755
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -1064,7 +1064,7 @@ Player* ChatHandler::getSelectedPlayer()
     if (guid == 0)
         return m_session->GetPlayer();
 
-    return sObjectMgr->GetPlayer(guid);
+    return ObjectAccessor::FindPlayer(guid);
 }
 
 Unit* ChatHandler::getSelectedUnit()
@@ -1374,7 +1374,7 @@ uint64 ChatHandler::extractGuidFromLink(char* text)
             if (!normalizePlayerName(name))
                 return 0;
 
-            if (Player* player = sObjectMgr->GetPlayer(name.c_str()))
+            if (Player* player = sObjectAccessor->FindPlayerByName(name.c_str()))
                 return player->GetGUID();
 
             if (uint64 guid = sObjectMgr->GetPlayerGUIDByName(name))
@@ -1432,7 +1432,7 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, uint64* playe
             return false;
         }
 
-        Player* pl = sObjectMgr->GetPlayer(name.c_str());
+        Player* pl = sObjectAccessor->FindPlayerByName(name.c_str());
 
         // if allowed player pointer
         if (player)
@@ -1567,7 +1567,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player* &plr, G
                 return false;
             }
 
-            plr = sObjectMgr->GetPlayer(name.c_str());
+            plr = sObjectAccessor->FindPlayerByName(name.c_str());
             if (offline)
                 guid = sObjectMgr->GetPlayerGUIDByName(name.c_str());
         }
diff --git a/src/server/game/Chat/Commands/Level3.cpp b/src/server/game/Chat/Commands/Level3.cpp
index 2c80217befa..dfe5e3edd7c 100755
--- a/src/server/game/Chat/Commands/Level3.cpp
+++ b/src/server/game/Chat/Commands/Level3.cpp
@@ -3080,7 +3080,7 @@ bool ChatHandler::HandleBanInfoCharacterCommand(const char *args)
     if (!*args)
         return false;
 
-    Player* target = sObjectMgr->GetPlayer(args);
+    Player* target = sObjectAccessor->FindPlayerByName(args);
     uint32 target_guid = 0;
     std::string name(args);
 
@@ -4464,7 +4464,7 @@ bool ChatHandler::HandleFreezeCommand(const char *args)
     {
         name = TargetName;
         normalizePlayerName(name);
-        player = sObjectMgr->GetPlayer(name.c_str()); //get player by name
+        player = sObjectAccessor->FindPlayerByName(name.c_str());
     }
 
     if (!player)
@@ -4529,7 +4529,7 @@ bool ChatHandler::HandleUnFreezeCommand(const char *args)
     {
         name = TargetName;
         normalizePlayerName(name);
-        player = sObjectMgr->GetPlayer(name.c_str()); //get player by name
+        player = sObjectAccessor->FindPlayerByName(name.c_str());
     }
 
     //effect
diff --git a/src/server/game/Chat/Commands/TicketCommands.cpp b/src/server/game/Chat/Commands/TicketCommands.cpp
index 656feb6970d..a80910ee20a 100755
--- a/src/server/game/Chat/Commands/TicketCommands.cpp
+++ b/src/server/game/Chat/Commands/TicketCommands.cpp
@@ -81,7 +81,7 @@ bool ChatHandler::HandleGMTicketGetByNameCommand(const char* args)
 
     // Detect target's GUID
     uint64 guid = 0;
-    if (Player* player = sObjectMgr->GetPlayer(name.c_str()))
+    if (Player* player = sObjectAccessor->FindPlayerByName(name.c_str()))
         guid = player->GetGUID();
     else
         guid = sObjectMgr->GetPlayerGUIDByName(name);