Scripts/Trial of Crusader: Fix static analysis issues

1 files changed, 11 insertions, 6 deletions

diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
index a6a6b680145..9594a607c86 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
@@ -206,7 +206,6 @@ struct boss_northrend_beastsAI : public BossAI
     boss_northrend_beastsAI(Creature* creature, uint32 bossId) : BossAI(creature, bossId)
     {
         SetBoundary(instance->GetBossBoundary(DATA_NORTHREND_BEASTS));
-        Initialize();
     }
 
     void Reset() override
@@ -216,7 +215,6 @@ struct boss_northrend_beastsAI : public BossAI
         summons.DespawnAll();
         me->SetReactState(REACT_PASSIVE);
         me->SetCombatPulseDelay(0);
-        Initialize();
         HandleInitialMovement();
     }
 
@@ -247,8 +245,6 @@ struct boss_northrend_beastsAI : public BossAI
         }
     }
 
-    virtual void Initialize() { }
-
     void EnterCombat(Unit* /*who*/) override
     {
         me->SetCombatPulseDelay(5);
@@ -626,9 +622,12 @@ private:
 
 struct boss_jormungarAI : public boss_northrend_beastsAI
 {
-    boss_jormungarAI(Creature* creature, uint32 bossId) : boss_northrend_beastsAI(creature, bossId) { }
+    boss_jormungarAI(Creature* creature, uint32 bossId) : boss_northrend_beastsAI(creature, bossId)
+    {
+        Initialize();
+    }
 
-    void Initialize() override
+    void Initialize()
     {
         otherWormEntry = 0;
         modelStationary = 0;
@@ -640,6 +639,12 @@ struct boss_jormungarAI : public boss_northrend_beastsAI
         wasMobile = false;
     }
 
+    void Reset() override
+    {
+        Initialize();
+        boss_northrend_beastsAI::Reset();
+    }
+
     void JustSummoned(Creature* summoned) override
     {
         if (summoned->GetEntry() == NPC_ACIDMAW)