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/scripts | |
| parent | fa50c0a4646fd87da807130a043db2d89c022ccb (diff) | |
Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons)
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_npc.cpp | 2 | ||||
| -rwxr-xr-x | src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 6e4c99f1de9..9431bba41d6 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -1040,7 +1040,7 @@ public: uint64 receiver_guid= atol(receiver_str); // check online security - if (handler->HasLowerSecurity(sObjectMgr->GetPlayer(receiver_guid), 0)) + if (handler->HasLowerSecurity(ObjectAccessor::FindPlayer(receiver_guid), 0)) return false; creature->MonsterWhisper(text, receiver_guid); diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp index 792fe450990..22811b84f75 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp @@ -311,7 +311,7 @@ void OPvPCapturePointZM_GraveYard::SetBeaconState(uint32 controlling_faction) if (m_FlagCarrierGUID) { // remove flag from carrier, reset flag carrier guid - Player* p = sObjectMgr->GetPlayer(m_FlagCarrierGUID); + Player* p = ObjectAccessor::FindPlayer(m_FlagCarrierGUID); if (p) { p->RemoveAurasDueToSpell(ZM_BATTLE_STANDARD_A); |
