Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 10:05:32 +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

4
src/server/game/Spells/Spell.cpp
View File

@@ -713,7 +713,7 @@ void Spell::SelectSpellTargets()
case SPELL_EFFECT_SUMMON_PLAYER:
if (m_caster->GetTypeId() == TYPEID_PLAYER && m_caster->ToPlayer()->GetSelection())
{
Player* target = sObjectMgr->GetPlayer(m_caster->ToPlayer()->GetSelection());
Player* target = ObjectAccessor::FindPlayer(m_caster->ToPlayer()->GetSelection());
if (target)
AddUnitTarget(target, i);
}
@@ -5230,7 +5230,7 @@ SpellCastResult Spell::CheckCast(bool strict)
if (!m_caster->ToPlayer()->GetSelection())
return SPELL_FAILED_BAD_TARGETS;
Player* target = sObjectMgr->GetPlayer(m_caster->ToPlayer()->GetSelection());
Player* target = ObjectAccessor::FindPlayer(m_caster->ToPlayer()->GetSelection());
if (!target || m_caster->ToPlayer() == target || !target->IsInSameRaidWith(m_caster->ToPlayer()))
return SPELL_FAILED_BAD_TARGETS;