diff --git a/Source/Game/Handlers/SpellHandler.cs b/Source/Game/Handlers/SpellHandler.cs index 7b97b8b34..9f846230a 100644 --- a/Source/Game/Handlers/SpellHandler.cs +++ b/Source/Game/Handlers/SpellHandler.cs @@ -291,9 +291,6 @@ namespace Game return; } - if (spellInfo.IsPassive()) - return; - Unit caster = mover; if (caster.IsTypeId(TypeId.Unit) && !caster.ToCreature().HasSpell(spellInfo.Id)) { @@ -336,6 +333,9 @@ namespace Game // Check possible spell cast overrides spellInfo = caster.GetCastSpellInfo(spellInfo); + if (spellInfo.IsPassive()) + return; + // can't use our own spells when we're in possession of another unit, if (GetPlayer().IsPossessing()) return;