josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/ConditionMgr: use chamer/owner player for spell condition check where avaliable

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Rat
2010-10-31 22:37:54 +01:00
parent 96df97c5ae
commit e68c149e69
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+4 -3
View File
@@ -2883,15 +2883,16 @@ void Spell::prepare(SpellCastTargets const* targets, AuraEffect const * triggere
return; return;
} }
} }
if (m_caster->ToPlayer()) if (Player* plrCaster = m_caster->GetCharmerOrOwnerPlayerOrPlayerItself())
{ {
//check for special spell conditions //check for special spell conditions
ConditionList conditions = sConditionMgr.GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id); ConditionList conditions = sConditionMgr.GetConditionsForNotGroupedEntry(CONDITION_SOURCE_TYPE_SPELL, m_spellInfo->Id);
if (!conditions.empty()) if (!conditions.empty())
{ {
if (!sConditionMgr.IsPlayerMeetToConditions(m_caster->ToPlayer(), conditions)) if (!sConditionMgr.IsPlayerMeetToConditions(plrCaster, conditions))
{ {
SendCastResult(SPELL_FAILED_DONT_REPORT); //SendCastResult(SPELL_FAILED_DONT_REPORT);
SendCastResult(plrCaster, m_spellInfo, m_cast_count, SPELL_FAILED_DONT_REPORT);
finish(false); finish(false);
return; return;
} }