server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Pets] Check pet power before it casts

Browse Source
This commit is contained in:
Olion 2015-09-22 15:32:12 +03:00 committed by Antz
parent 08756dd2c4
commit d91804bc05
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/game/WorldHandlers/Spell.cpp
View File

@ -3702,7 +3702,7 @@ void Spell::TakeCastItem()
void Spell::TakePower() void Spell::TakePower()
{ {
if (m_CastItem || m_triggeredByAuraSpell) if (m_CastItem || m_IsTriggeredSpell) // all triggered spells ignore power req
{ return; } { return; }
// health as power used // health as power used
@ -3712,11 +3712,8 @@ void Spell::TakePower()
return; return;
} }
if (m_spellInfo->powerType >= MAX_POWERS) // the static data (m_spellInfo) should be checked elsewhere
{ // [+ZERO] actual DBC power values are 0..3 and uint32(-2)
sLog.outError("Spell::TakePower: Unknown power type '%d'", m_spellInfo->powerType);
return;
}
Powers powerType = Powers(m_spellInfo->powerType); Powers powerType = Powers(m_spellInfo->powerType);
@ -5559,33 +5556,40 @@ uint32 Spell::CalculatePowerCost(SpellEntry const* spellInfo, Unit* caster, Spel
SpellCastResult Spell::CheckPower() SpellCastResult Spell::CheckPower()
{ {
// never check power for triggered spells
if (m_IsTriggeredSpell)
return SPELL_CAST_OK;
// item cast not used power // item cast not used power
if (m_CastItem) if (m_CastItem)
{ return SPELL_CAST_OK; } { return SPELL_CAST_OK; }
// Questgivers ignore power requirements for scripts // Questgivers ignore power requirements for scripts, any other creature (except a per) is checked only in combat
if (m_caster->GetTypeId() != TYPEID_PLAYER && m_caster->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER) != m_caster->IsInCombat()) if (m_caster->GetTypeId() != TYPEID_PLAYER)
{ return SPELL_CAST_OK; } {
// power for pets should be checked
if (!m_caster->GetObjectGuid().IsPet() && m_caster->HasFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER) != m_caster->IsInCombat())
return SPELL_CAST_OK;
}
// health as power used - need check health amount // health as power used - need check health amount
if (m_spellInfo->powerType == POWER_HEALTH) if (m_spellInfo->powerType == POWER_HEALTH)
{ {
if (m_caster->GetHealth() <= m_powerCost) if (m_caster->GetHealth() <= m_powerCost)
{ return SPELL_FAILED_CANT_DO_THAT_YET; } return SPELL_FAILED_CANT_DO_THAT_YET;
return SPELL_CAST_OK;
} }
else // any power except health
// Check valid power type
if (m_spellInfo->powerType >= MAX_POWERS)
{ {
sLog.outError("Spell::CheckMana: Unknown power type '%d'", m_spellInfo->powerType); // Check valid power type: since the static data (m_spellInfo) are checked, the check should be done elsewhere
return SPELL_FAILED_UNKNOWN; // [+ZERO] actual DBC power values are 0..3 and uint32(-2)
}
// Check power amount // Check power amount
Powers powerType = Powers(m_spellInfo->powerType); Powers powerType = Powers(m_spellInfo->powerType);
if (m_caster->GetPower(powerType) < m_powerCost) if (m_caster->GetPower(powerType) < m_powerCost)
{ return SPELL_FAILED_NO_POWER; } {
return SPELL_FAILED_NO_POWER;
}
}
return SPELL_CAST_OK; return SPELL_CAST_OK;
} }