Scripts/HellfireRamparts: Remove the spawning of the Reinforced Fel Iron chest from scripts

Updates #13747

4 files changed, 12 insertions, 16 deletions

diff --git a/sql/updates/world/2015_01_09_01_world.sql b/sql/updates/world/2015_01_09_01_world.sql
new file mode 100644
index 00000000000..d07bd8b4162
--- /dev/null
+++ b/sql/updates/world/2015_01_09_01_world.sql
@@ -0,0 +1,5 @@
+-- Replace the previously spawned chests with sniffed ones

+DELETE FROM `gameobject` WHERE `id` IN (185168, 185169) AND `guid` IN (20499, 20496);

+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES

+(20496, 185168, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243), -- 185168 (Area: 3562)

+(20499, 185169, 543, 3, 1, -1429.81, 1772.916, 82.0765, 5.044002, 0, 0, 0, 1, 7200, 255, 1, 19243); -- 185169 (Area: 3562)

diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index f3e655b45b5..b23dbb2db2f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -434,13 +434,6 @@ class boss_vazruden_the_herald : public CreatureScript
                                 return;
                             }
                         }
-                        else if (!lootSpawned)
-                        {
-                            me->SummonGameObject(DUNGEON_MODE(GO_FEL_IRON_CHEST_NORMAL, GO_FEL_IRON_CHECT_HEROIC), VazrudenMiddle[0], VazrudenMiddle[1], VazrudenMiddle[2], 0, 0, 0, 0, 0, 0);
-                            me->SetLootRecipient(NULL); // don't think this is necessary..
-                            //me->Kill(me);
-                            lootSpawned = true;
-                        }
                         check = 2000;
                     }
                     else
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index 100a10fadcd..f41b76a1a0b 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -43,7 +43,7 @@ enum CreatureIds
 enum GameobjectIds
 {
     GO_FEL_IRON_CHEST_NORMAL      = 185168,
-    GO_FEL_IRON_CHECT_HEROIC      = 185169
+    GO_FEL_IRON_CHEST_HEROIC      = 185169
 };
 
 #endif
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index 1e8f1b5e9ac..4d45845c646 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -36,7 +36,6 @@ class instance_ramparts : public InstanceMapScript
         {
             instance_ramparts_InstanceMapScript(Map* map) : InstanceScript(map)
             {
-                spawned = false;
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
             }
@@ -46,7 +45,7 @@ class instance_ramparts : public InstanceMapScript
                 switch (go->GetEntry())
                 {
                     case GO_FEL_IRON_CHEST_NORMAL:
-                    case GO_FEL_IRON_CHECT_HEROIC:
+                    case GO_FEL_IRON_CHEST_HEROIC:
                         felIronChestGUID = go->GetGUID();
                         break;
                 }
@@ -61,11 +60,11 @@ class instance_ramparts : public InstanceMapScript
                 {
                     case DATA_VAZRUDEN:
                     case DATA_NAZAN:
-                        if (GetBossState(DATA_VAZRUDEN) == DONE && GetBossState(DATA_NAZAN) == DONE && !spawned)
-                        {
-                            DoRespawnGameObject(felIronChestGUID, HOUR*IN_MILLISECONDS);
-                            spawned = true;
-                        }
+                        if (GetBossState(DATA_VAZRUDEN) == DONE && GetBossState(DATA_NAZAN) == DONE)
+                            if (GameObject* chest = instance->GetGameObject(felIronChestGUID))
+                                chest->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
+                        break;
+                    default:
                         break;
                 }
                 return true;
@@ -73,7 +72,6 @@ class instance_ramparts : public InstanceMapScript
 
         protected:
             ObjectGuid felIronChestGUID;
-            bool spawned;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override