diff options
| author | Spp- <u84280@epreinf21.(none)> | 2011-07-27 12:14:27 +0200 |
|---|---|---|
| committer | Spp- <u84280@epreinf21.(none)> | 2011-07-27 12:14:27 +0200 |
| commit | b2a84d9f1edb5bf7df83e05f83ccccbdfca3b7b2 (patch) | |
| tree | 1ca392df9474efcc85cc48a1bec26893e9b7344f /src/server/game/Globals/ObjectMgr.cpp | |
| parent | fa50c0a4646fd87da807130a043db2d89c022ccb (diff) | |
Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 2cff8f4d219..06200ca9316 100755 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -2015,7 +2015,7 @@ uint64 ObjectMgr::GetPlayerGUIDByName(std::string name) const bool ObjectMgr::GetPlayerNameByGUID(const uint64 &guid, std::string &name) const { // prevent DB access for online player - if (Player* player = GetPlayer(guid)) + if (Player* player = ObjectAccessor::FindPlayer(guid)) { name = player->GetName(); return true; @@ -2035,7 +2035,7 @@ bool ObjectMgr::GetPlayerNameByGUID(const uint64 &guid, std::string &name) const uint32 ObjectMgr::GetPlayerTeamByGUID(const uint64 &guid) const { // prevent DB access for online player - if (Player* player = GetPlayer(guid)) + if (Player* player = ObjectAccessor::FindPlayer(guid)) { return Player::TeamForRace(player->getRace()); } @@ -2054,7 +2054,7 @@ uint32 ObjectMgr::GetPlayerTeamByGUID(const uint64 &guid) const uint32 ObjectMgr::GetPlayerAccountIdByGUID(const uint64 &guid) const { // prevent DB access for online player - if (Player* player = GetPlayer(guid)) + if (Player* player = ObjectAccessor::FindPlayer(guid)) { return player->GetSession()->GetAccountId(); } @@ -5427,7 +5427,7 @@ void ObjectMgr::ReturnOrDeleteOldMails(bool serverUp) Player *pl = NULL; if (serverUp) - pl = GetPlayer((uint64)m->receiver); + pl = ObjectAccessor::FindPlayer((uint64)m->receiver); if (pl && pl->m_mailsLoaded) { // this code will run very improbably (the time is between 4 and 5 am, in game is online a player, who has old mail |