Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Spp-
2011-07-27 12:14:27 +02:00
parent fa50c0a464
commit b2a84d9f1e
47 changed files with 166 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Commands/cs_npc.cpp
View File

@@ -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);

2
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
View File

@@ -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);