aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
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/Entities/GameObject
parentfa50c0a4646fd87da807130a043db2d89c022ccb (diff)
Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index a48f1c774fe..81f738bec27 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -1120,7 +1120,7 @@ void GameObject::Use(Unit* user)
if (itr->second)
{
- if (Player* ChairUser = sObjectMgr->GetPlayer(itr->second))
+ if (Player* ChairUser = ObjectAccessor::FindPlayer(itr->second))
if (ChairUser->IsSitState() && ChairUser->getStandState() != UNIT_STAND_STATE_SIT && ChairUser->GetExactDist2d(x_i, y_i) < 0.1f)
continue; // This seat is already occupied by ChairUser. NOTE: Not sure if the ChairUser->getStandState() != UNIT_STAND_STATE_SIT check is required.
else