diff options
| author | Nyeriah <sarah.trysan@live.com> | 2015-01-10 03:37:43 -0200 |
|---|---|---|
| committer | Nyeriah <sarah.trysan@live.com> | 2015-01-10 03:37:43 -0200 |
| commit | 6aac2bf2a70a3e099bc26bd087846e7f891ec3b0 (patch) | |
| tree | 8cc922f336551ac3931597a91879a29f7c27920f /src | |
| parent | f66596a33591559b13a75eb975ab692d46d24213 (diff) | |
Scripts/HellfireRamparts: Remove the spawning of the Reinforced Fel Iron chest from scripts
Updates #13747
(cherry picked from commit 9c9e5abca3dd9bdc8f776ffacd72500367e56043)
Diffstat (limited to 'src')
3 files changed, 7 insertions, 18 deletions
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..3951b0eadf6 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 @@ -297,7 +297,6 @@ class boss_vazruden_the_herald : public CreatureScript Initialize(); summoned = false; sentryDown = false; - lootSpawned = false; } void Initialize() @@ -434,13 +433,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 @@ -457,7 +449,6 @@ class boss_vazruden_the_herald : public CreatureScript ObjectGuid NazanGUID; ObjectGuid VazrudenGUID; bool summoned; - bool lootSpawned; }; CreatureAI* GetAI(Creature* creature) const override 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 |
