diff options
| author | QAston <none@none> | 2009-07-08 22:26:46 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-07-08 22:26:46 +0200 |
| commit | f829ee0dc0e669a9d7ca20710dc2a9fcba48f80f (patch) | |
| tree | 24bd6441a00b8b1e00863ca0e238071e0f7f6285 /src/game/Spell.cpp | |
| parent | 60e8de1d2ef8d92e43fb9139b82b6ec5e60936dd (diff) | |
*Correct target requirement for eyes of the beast and add some crash preventing checks to charm code.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Spell.cpp')
| -rw-r--r-- | src/game/Spell.cpp | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index e5c0550d239..610e6af6b06 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4998,17 +4998,22 @@ SpellCastResult Spell::CheckCast(bool strict) return SPELL_FAILED_ALREADY_HAVE_CHARM; } - Unit *target = m_targets.getUnitTarget(); - if(!target || target->GetTypeId() == TYPEID_UNIT - && ((Creature*)target)->isVehicle()) - return SPELL_FAILED_BAD_IMPLICIT_TARGETS; + // Skip TARGET_UNIT_PET - pet is always valid + if (m_spellInfo->EffectImplicitTargetA[i] != TARGET_UNIT_PET + && m_spellInfo->EffectImplicitTargetB[i] != TARGET_UNIT_PET) + { + Unit *target = m_targets.getUnitTarget(); + if(!target || target->GetTypeId() == TYPEID_UNIT + && ((Creature*)target)->isVehicle()) + return SPELL_FAILED_BAD_IMPLICIT_TARGETS; - if(target->GetCharmerGUID()) - return SPELL_FAILED_CHARMED; + if(target->GetCharmerGUID()) + return SPELL_FAILED_CHARMED; - int32 damage = CalculateDamage(i, target); - if(damage && int32(target->getLevel()) > damage) - return SPELL_FAILED_HIGHLEVEL; + int32 damage = CalculateDamage(i, target); + if(damage && int32(target->getLevel()) > damage) + return SPELL_FAILED_HIGHLEVEL; + } break; } |