Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Correct target requirement for eyes of the beast and add some crash preventing checks to charm code.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
QAston
2009-07-08 22:26:46 +02:00
parent 60e8de1d2e
commit f829ee0dc0
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/Spell.cpp
View File

@@ -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;
}