Spells: Allow secondary target checking for area auras

cmangos · Jun 17, 2023 · d36511d · d36511d
1 parent dc5621b
commit d36511d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/game/Entities/DynamicObject.cpp b/src/game/Entities/DynamicObject.cpp
@@ -216,9 +216,9 @@ void DynamicObject::OnPersistentAreaAuraEnd()
         m_auraScript->OnPersistentAreaAuraEnd(this);
 }
 
-bool DynamicObject::OnAreaAuraCheckTarget(Aura* aura, Unit* target)
+bool DynamicObject::OnAreaAuraCheckTarget(Unit* target)
 {
-    if (aura->GetAuraScript())
-        return aura->GetAuraScript()->OnAreaAuraCheckTarget(aura, target);
+    if (m_auraScript)
+        return m_auraScript->OnAreaAuraCheckTarget(this, target);
     return true;
 }
diff --git a/src/game/Entities/DynamicObject.h b/src/game/Entities/DynamicObject.h
@@ -71,7 +71,7 @@ class DynamicObject : public WorldObject
         bool CanAssistSpell(Unit const* target, SpellEntry const* spellInfo = nullptr) const override;
 
         void OnPersistentAreaAuraEnd();
-        bool OnAreaAuraCheckTarget(Aura* aura, Unit* target);
+        bool OnAreaAuraCheckTarget(Unit* target);
 
         float GetObjectBoundingRadius() const override { return 0.f; } // dynamic object not have real interact size
         float GetCollisionHeight() const override { return 1.f; } // to get away with ground collision

diff --git a/src/game/Grids/GridNotifiersImpl.h b/src/game/Grids/GridNotifiersImpl.h
@@ -258,6 +258,8 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
         }
     }
 
+    i_dynobject.OnAreaAuraCheckTarget(target);
+
     if (spellInfo->HasAttribute(SPELL_ATTR_EX3_ONLY_ON_PLAYER) && target->GetTypeId() != TYPEID_PLAYER)
         return;
 
@@ -284,8 +286,6 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
         if (!holder->GetAuraByEffectIndex(eff_index))
         {
             PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, &i_dynobject.GetDamage(), &i_dynobject.GetBasePoints(), holder, target, caster);
-            if (!i_dynobject.OnAreaAuraCheckTarget(Aur, target))
-                return;
             holder->AddAura(Aur, eff_index);
             target->AddAuraToModList(Aur);
             Aur->ApplyModifier(true, true);
@@ -300,8 +300,6 @@ inline void MaNGOS::DynamicObjectUpdater::VisitHelper(Unit* target)
     {
         holder = CreateSpellAuraHolder(spellInfo, target, caster);
         PersistentAreaAura* Aur = new PersistentAreaAura(spellInfo, eff_index, &i_dynobject.GetDamage(), &i_dynobject.GetBasePoints(), holder, target, caster);
-        if (!i_dynobject.OnAreaAuraCheckTarget(Aur, target))
-            return;
         holder->SetAuraDuration(i_dynobject.GetDuration());
         holder->AddAura(Aur, eff_index);
         if (!target->AddSpellAuraHolder(holder))

diff --git a/src/game/Spells/Scripts/SpellScript.h b/src/game/Spells/Scripts/SpellScript.h
@@ -126,7 +126,7 @@ struct AuraScript
     // called on persistent area aura dyngo lifetime end
     virtual void OnPersistentAreaAuraEnd(DynamicObject* /*dynGo*/) const {}
     // called on AreaAura target selection
-    virtual bool OnAreaAuraCheckTarget(Aura* aura, Unit* target) const { return true; }
+    virtual bool OnAreaAuraCheckTarget(DynamicObject* /*dynGo*/, Unit* /*target*/) const { return true; }
     // called on unit heartbeat
     virtual void OnHeartbeat(Aura* /*aura*/) const {}
     // used to override SPELL_AURA_TRANSFORM or SPELL_AURA_MOD_SHAPESHIFT display id - more uses in future