Merge branch 'master' into eqstream

This commit is contained in:
KimLS
2017-01-13 21:53:21 -08:00
+1 -1
View File
@@ -3637,7 +3637,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
}
if(!IsBeneficialAllowed(spelltar) ||
if((!IsAllianceSpellLine(spell_id) && !IsBeneficialAllowed(spelltar)) ||
(IsGroupOnlySpell(spell_id) &&
!(
(pBasicGroup && ((pBasicGroup == pBasicGroupTarget) || (pBasicGroup == pBasicGroupTargetPet))) || //Basic Group