diff options
| -rw-r--r-- | sql/updates/world/2013_07_01_04_world_gameobject.sql | 2 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp | 70 |
2 files changed, 26 insertions, 46 deletions
diff --git a/sql/updates/world/2013_07_01_04_world_gameobject.sql b/sql/updates/world/2013_07_01_04_world_gameobject.sql new file mode 100644 index 00000000000..f53850871fe --- /dev/null +++ b/sql/updates/world/2013_07_01_04_world_gameobject.sql @@ -0,0 +1,2 @@ +UPDATE `gameobject_template` SET `flags`=16 WHERE `entry` IN (181366,193426); +UPDATE `gameobject` SET `position_x`=2516.595,`position_y`=-2946.82,`position_z`=245.5516,`orientation`=5.480335,`rotation2`=0,`rotation3`=0,`animprogress`=255 WHERE `id` IN (181366,193426); diff --git a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp index 3df599bf1ef..e55de3e3dcb 100644 --- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp +++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp @@ -125,10 +125,6 @@ class instance_naxxramas : public InstanceMapScript SapphironGUID = 0; KelthuzadGUID = 0; KelthuzadTriggerGUID = 0; - AracPortalGUID = 0; - PlagPortalGUID = 0; - MiliPortalGUID = 0; - ConsPortalGUID = 0; playerDied = 0; @@ -195,42 +191,30 @@ class instance_naxxramas : public InstanceMapScript switch (go->GetEntry()) { - case GO_GOTHIK_GATE: - GothikGateGUID = go->GetGUID(); - break; - case GO_HORSEMEN_CHEST: - case GO_HORSEMEN_CHEST_HERO: - HorsemenChestGUID = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL01: - PortalsGUID[0] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL02: - PortalsGUID[1] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL03: - PortalsGUID[2] = go->GetGUID(); - break; - case GO_KELTHUZAD_PORTAL04: - PortalsGUID[3] = go->GetGUID(); - break; - case GO_KELTHUZAD_TRIGGER: - KelthuzadTriggerGUID = go->GetGUID(); - break; - case GO_ARAC_PORTAL: - AracPortalGUID = go->GetGUID(); - break; - case GO_PLAG_PORTAL: - PlagPortalGUID = go->GetGUID(); - break; - case GO_MILI_PORTAL: - MiliPortalGUID = go->GetGUID(); - break; - case GO_CONS_PORTAL: - ConsPortalGUID = go->GetGUID(); - break; - default: - break; + case GO_GOTHIK_GATE: + GothikGateGUID = go->GetGUID(); + break; + case GO_HORSEMEN_CHEST: + case GO_HORSEMEN_CHEST_HERO: + HorsemenChestGUID = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL01: + PortalsGUID[0] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL02: + PortalsGUID[1] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL03: + PortalsGUID[2] = go->GetGUID(); + break; + case GO_KELTHUZAD_PORTAL04: + PortalsGUID[3] = go->GetGUID(); + break; + case GO_KELTHUZAD_TRIGGER: + KelthuzadTriggerGUID = go->GetGUID(); + break; + default: + break; } AddDoor(go, true); @@ -525,12 +509,6 @@ class instance_naxxramas : public InstanceMapScript uint64 PortalsGUID[4]; uint8 AbominationCount; - /* Portals */ - uint64 AracPortalGUID; - uint64 PlagPortalGUID; - uint64 MiliPortalGUID; - uint64 ConsPortalGUID; - /* The Immortal / The Undying */ uint32 playerDied; }; |