Scripts/Ulduar: Better handling of Conservator's Grip

1 files changed, 5 insertions, 8 deletions

diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
index 4a77f3e86b1..d341c0c32fa 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_freya.cpp
@@ -1264,7 +1264,6 @@ class npc_ancient_conservator : public CreatureScript
                 natureFuryTimer = 7500;
                 healthySporeTimer = 3500;
                 SummonHealthySpores(2);
-                grip = false;
             }
 
             void SummonHealthySpores(uint8 sporesCount)
@@ -1278,17 +1277,16 @@ class npc_ancient_conservator : public CreatureScript
                 }
             }
 
+            void EnterCombat(Unit* who)
+            {
+                DoCast(who, SPELL_CONSERVATOR_GRIP, true);
+            }
+
             void UpdateAI(uint32 const diff)
             {
                 if (!UpdateVictim())
                     return;
 
-                if (!grip)
-                {
-                    me->CastSpell(me->getVictim(), SPELL_CONSERVATOR_GRIP, true);
-                    grip = true;
-                }
-
                 if (healthySporeTimer <= diff)
                 {
                     SummonHealthySpores(1);
@@ -1313,7 +1311,6 @@ class npc_ancient_conservator : public CreatureScript
         private:
             uint32 natureFuryTimer;
             uint32 healthySporeTimer;
-            bool grip;
         };
 
         CreatureAI* GetAI(Creature* creature) const