aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Chat/Chat.cpp
diff options
context:
space:
mode:
authorSpp- <u84280@epreinf21.(none)>2011-07-27 12:14:27 +0200
committerSpp- <u84280@epreinf21.(none)>2011-07-27 12:14:27 +0200
commitb2a84d9f1edb5bf7df83e05f83ccccbdfca3b7b2 (patch)
tree1ca392df9474efcc85cc48a1bec26893e9b7344f /src/server/game/Chat/Chat.cpp
parentfa50c0a4646fd87da807130a043db2d89c022ccb (diff)
Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)
Diffstat (limited to 'src/server/game/Chat/Chat.cpp')
-rwxr-xr-xsrc/server/game/Chat/Chat.cpp8
1 files changed, 4 insertions, 4 deletions
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());
}