Scripts/Misc: use the new SetAggressiveStateAfter AI method on another script

2 files changed, 4 insertions, 18 deletions

diff --git a/src/server/game/Miscellaneous/CommonHelpers.cpp b/src/server/game/Miscellaneous/CommonHelpers.cpp
index c00d4dc65f4..dbe86ef3309 100644
--- a/src/server/game/Miscellaneous/CommonHelpers.cpp
+++ b/src/server/game/Miscellaneous/CommonHelpers.cpp
@@ -356,6 +356,8 @@ bool Trinity::Helpers::Events::SetAggresiveStateEvent::Execute(uint64 /*time*/,
             if (_owner->IsAIEnabled())
                 _owner->AI()->AttackStart(currentVictim);
         }
+        else if (_owner->IsAIEnabled())
+            _owner->AI()->DoZoneInCombat();
     }
     return true;
 }
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
index 995b690d721..2f5c545b106 100644
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
@@ -108,23 +108,6 @@ enum Misc
     SUMMON_MINIBOSSES_GROUP = 1
 };
 
-class WormAttackEvent : public BasicEvent
-{
-public:
-    WormAttackEvent(TempSummon* owner) : BasicEvent(), _owner(owner) { }
-
-    bool Execute(uint64 /*eventTime*/, uint32 /*diff*/) override
-    {
-        _owner->SetReactState(REACT_AGGRESSIVE);
-        _owner->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN);
-        _owner->AI()->DoZoneInCombat();
-        return true;
-    }
-
-private:
-    TempSummon* _owner;
-};
-
 class OrbFinalPositionEvent : public BasicEvent
 {
 public:
@@ -466,7 +449,8 @@ struct boss_massive_jormungar : public PalehoofMinionsBossAI
     {
         if (summon->GetEntry() == NPC_JORMUNGAR_WORM)
         {
-            summon->m_Events.AddEvent(new WormAttackEvent(summon->ToTempSummon()), summon->m_Events.CalculateTime(2s));
+            summon->ToTempSummon()->SetTempSummonType(TEMPSUMMON_CORPSE_DESPAWN);
+            SetAggressiveStateAfter(2s, summon, true);
             summon->GetMotionMaster()->MoveRandom(5.0f);
         }
     }