Merge c054cb3dd08229a97f3ec199e0e3bf57e9636a19 into 5d8af58e57a91245669002ceea249e2b1208a27d

This commit is contained in:
Kemmler 2013-02-28 21:38:44 -08:00
commit 06615bfa10

View File

@ -1306,8 +1306,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
case ST_SummonedPet:
{
uint8 body_type = spell_target ? spell_target->GetBodyType() : 0;
if(spell_target && (spell_target == GetPet()) &&
(body_type == BT_Summoned || body_type == BT_Summoned2 || body_type == BT_Summoned3 || body_type == BT_Animal))
if(!spell_target || (spell_target != GetPet()) ||
(body_type != BT_Summoned && body_type != BT_Summoned2 && body_type != BT_Summoned3 && body_type != BT_Animal))
{
mlog(SPELLS__CASTING_ERR, "Spell %d canceled: invalid target of body type %d (summoned pet)",
spell_id, body_type);