From b2a84d9f1edb5bf7df83e05f83ccccbdfca3b7b2 Mon Sep 17 00:00:00 2001 From: Spp- Date: Wed, 27 Jul 2011 12:14:27 +0200 Subject: Core/ObjectMgr: Remove GetPlayer function (Remove double use of singletons) --- src/server/game/Entities/Unit/Unit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Entities/Unit') diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 57db119f932..1a6e8f397e2 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14753,7 +14753,7 @@ void Unit::ClearComboPointHolders() { uint32 lowguid = *m_ComboPointHolders.begin(); - Player* plr = sObjectMgr->GetPlayer(MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER)); + Player* plr = ObjectAccessor::FindPlayer(MAKE_NEW_GUID(lowguid, 0, HIGHGUID_PLAYER)); if (plr && plr->GetComboTarget() == GetGUID()) // recheck for safe plr->ClearComboPoints(); // remove also guid from m_ComboPointHolders; else @@ -15365,7 +15365,7 @@ void Unit::Kill(Unit* victim, bool durabilityLoss) group->UpdateLooterGuid(creature, true); if (group->GetLooterGuid()) { - looter = sObjectMgr->GetPlayer(group->GetLooterGuid()); + looter = ObjectAccessor::FindPlayer(group->GetLooterGuid()); if (looter) { creature->SetLootRecipient(looter); // update creature loot recipient to the allowed looter. -- cgit v1.2.3