Scripts/Ulduar: Move handling of Razorscale Mole Machine to instance script.

2 files changed, 3 insertions, 2 deletions

diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
index 523011b79c2..a1308a6de86 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/boss_razorscale.cpp
@@ -758,8 +758,6 @@ class npc_mole_machine_trigger : public CreatureScript
                 if (!GobSummoned && SummonGobTimer <= Diff)
                 {
                     DoCast(SPELL_SUMMON_MOLE_MACHINE);
-                    if (GameObject* molemachine = me->FindNearestGameObject(GO_MOLE_MACHINE, 1))
-                        molemachine->SetGoState(GO_STATE_ACTIVE);
                     GobSummoned = true;
                 }
                 else
diff --git a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
index 33809ce6186..5cc635f4f02 100644
--- a/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/ulduar/instance_ulduar.cpp
@@ -255,6 +255,9 @@ public:
                 case GO_RAZOR_HARPOON_4:
                     uiRazorHarpoonGUIDs[3] = go->GetGUID();
                     break;
+                case GO_MOLE_MACHINE:
+                    if (GetBossState(TYPE_RAZORSCALE) == IN_PROGRESS)
+                        go->SetGoState(GO_STATE_ACTIVE);
             }
         }