Core/Units: ported power type updates from master branch

This commit is contained in:
Ovahlord committed 2020-04-22 03:13:02 +02:00
1 parent e67167e8cf
commit b653f2f819
40 files changed
+259 -278

No files matched your search

+3 -3
View File
@@ -5807,7 +5807,7 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
// Can be area effect, Check only for players and not check if target - caster (spell can have multiply drain/burn effects)
if (m_caster->GetTypeId() == TYPEID_PLAYER)
if (Unit* target = m_targets.GetUnitTarget())
if (target != m_caster && target->getPowerType() != Powers(m_spellInfo->Effects[i].MiscValue))
if (target != m_caster && target->GetPowerType() != Powers(m_spellInfo->Effects[i].MiscValue))
return SPELL_FAILED_BAD_TARGETS;
break;
}
@@ -6191,9 +6191,9 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
if (m_caster->GetTypeId() != TYPEID_PLAYER || m_CastItem)
break;
if (m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->getPowerType() != POWER_MANA)
if (m_targets.GetUnitTarget() && m_targets.GetUnitTarget()->GetPowerType() != POWER_MANA)
return SPELL_FAILED_BAD_TARGETS;
else if (!m_targets.GetUnitTarget() && m_caster->getPowerType() != POWER_MANA)
else if (!m_targets.GetUnitTarget() && m_caster->GetPowerType() != POWER_MANA)
return SPELL_FAILED_BAD_TARGETS;
break;