Core/WorldStates: Migrate instance script worldstates to new system

11 files changed, 27 insertions, 198 deletions

diff --git a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
index c1be17907d8..0fd569a94f3 100644
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -23,7 +23,6 @@
 #include "Map.h"
 #include "ScriptMgr.h"
 #include "TemporarySummon.h"
-#include "WorldStatePackets.h"
 
 Position const HalionControllerSpawnPos = { 3156.037f, 533.2656f, 72.97205f, 0.0f };
 
@@ -197,13 +196,6 @@ class instance_ruby_sanctum : public InstanceMapScript
                 return BaltharusSharedHealth;
             }
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                packet.Worldstates.emplace_back(WORLDSTATE_CORPOREALITY_MATERIAL, 50);
-                packet.Worldstates.emplace_back(WORLDSTATE_CORPOREALITY_TWILIGHT, 50);
-                packet.Worldstates.emplace_back(WORLDSTATE_CORPOREALITY_TOGGLE, 0);
-            }
-
         protected:
             ObjectGuid ZarithrianSpawnStalkerGUID[2];
             uint32 BaltharusSharedHealth;
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
index 8caf0140d3a..4a6f285d4ae 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -117,22 +117,15 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 ResilienceWillFixItTimer = 0;
                 SnoboldCount = 0;
                 MistressOfPainCount = 0;
-                TributeToImmortalityEligible = true;
+                PlayerDeathCount = 0;
                 NeedSave = false;
                 CrusadersSpecialState = false;
                 TributeToDedicatedInsanity = false; // NYI, set to true when implement it
+                DoUpdateWorldState(UPDATE_STATE_UI_SHOW, instance->IsHeroic() ? 1 : 0);
             }
 
             void OnPlayerEnter(Player* player) override
             {
-                if (instance->IsHeroic())
-                {
-                    player->SendUpdateWorldState(UPDATE_STATE_UI_SHOW, 1);
-                    player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, GetData(TYPE_COUNTER));
-                }
-                else
-                    player->SendUpdateWorldState(UPDATE_STATE_UI_SHOW, 0);
-
                 if (Team == TEAM_OTHER)
                     Team = player->GetTeam();
 
@@ -167,8 +160,10 @@ class instance_trial_of_the_crusader : public InstanceMapScript
             void OnUnitDeath(Unit* unit) override
             {
                 if (unit->GetTypeId() == TYPEID_PLAYER && IsEncounterInProgress())
-                    TributeToImmortalityEligible = false;
-
+                {
+                    ++PlayerDeathCount;
+                    DoUpdateWorldState(WORLD_STATE_PLAYER_DEATHS, PlayerDeathCount);
+                }
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -305,10 +300,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                         {
                             --TrialCounter;
                             // decrease attempt counter at wipe
-                            Map::PlayerList const& PlayerList = instance->GetPlayers();
-                            for (Map::PlayerList::const_iterator itr = PlayerList.begin(); itr != PlayerList.end(); ++itr)
-                                if (Player* player = itr->GetSource())
-                                    player->SendUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter);
+                            DoUpdateWorldState(UPDATE_STATE_UI_COUNT, TrialCounter);
 
                             // if theres no more attemps allowed
                             if (!TrialCounter)
@@ -581,7 +573,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                     saveStream << GetBossState(i) << ' ';
 
                 saveStream << TrialCounter << ' '
-                    << uint32(TributeToImmortalityEligible ? 1 : 0) << ' '
+                    << PlayerDeathCount << ' '
                     << uint32(TributeToDedicatedInsanity ? 1 : 0);
                 SaveDataBuffer = saveStream.str();
 
@@ -617,8 +609,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 }
 
                 loadStream >> TrialCounter;
-                loadStream >> tmpState;
-                TributeToImmortalityEligible = tmpState != 0;
+                loadStream >> PlayerDeathCount;
                 loadStream >> tmpState;
                 TributeToDedicatedInsanity = tmpState != 0;
                 EventStage = 0;
@@ -641,19 +632,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                     case THREE_SIXTY_PAIN_SPIKE_25_PLAYER:
                     case THREE_SIXTY_PAIN_SPIKE_25_PLAYER_HEROIC:
                         return MistressOfPainCount >= 2;
-                    case A_TRIBUTE_TO_SKILL_10_PLAYER:
-                    case A_TRIBUTE_TO_SKILL_25_PLAYER:
-                        return TrialCounter >= 25;
-                    case A_TRIBUTE_TO_MAD_SKILL_10_PLAYER:
-                    case A_TRIBUTE_TO_MAD_SKILL_25_PLAYER:
-                        return TrialCounter >= 45;
-                    case A_TRIBUTE_TO_INSANITY_10_PLAYER:
-                    case A_TRIBUTE_TO_INSANITY_25_PLAYER:
-                    case REALM_FIRST_GRAND_CRUSADER:
-                        return TrialCounter == 50;
-                    case A_TRIBUTE_TO_IMMORTALITY_HORDE:
-                    case A_TRIBUTE_TO_IMMORTALITY_ALLIANCE:
-                        return TrialCounter == 50 && TributeToImmortalityEligible;
                     case A_TRIBUTE_TO_DEDICATED_INSANITY:
                         return false/*TrialCounter == 50 && TributeToDedicatedInsanity*/;
                     default:
@@ -680,7 +658,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                 uint8 SnoboldCount;
                 uint8 MistressOfPainCount;
                 uint8 NorthrendBeastsCount;
-                bool TributeToImmortalityEligible;
+                int32 PlayerDeathCount;
                 bool TributeToDedicatedInsanity;
         };
 
diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
index 856d3cf061b..593ebc4ba5d 100644
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h
@@ -128,8 +128,9 @@ extern Position const AnubarakLoc[];
 
 enum TCRWorldStateIds
 {
-    UPDATE_STATE_UI_SHOW  = 4390,
-    UPDATE_STATE_UI_COUNT = 4389
+    UPDATE_STATE_UI_SHOW        = 4390,
+    UPDATE_STATE_UI_COUNT       = 4389,
+    WORLD_STATE_PLAYER_DEATHS   = 4408
 };
 
 enum NorthrendBeasts
diff --git a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
index f9deeeaa26b..eb92cff9851 100644
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -24,7 +24,6 @@
 #include "ScriptMgr.h"
 #include "TemporarySummon.h"
 #include "Transport.h"
-#include "WorldStatePackets.h"
 #include <sstream>
 
 Position const JainaSpawnPos           = { 5236.659f, 1929.894f, 707.7781f, 0.8726646f }; // Jaina Spawn Position
@@ -294,12 +293,6 @@ class instance_halls_of_reflection : public InstanceMapScript
                 }
             }
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                packet.Worldstates.emplace_back(WORLD_STATE_HOR_WAVES_ENABLED, (_introState == DONE && GetBossState(DATA_MARWYN) != DONE) ? 1 : 0);
-                packet.Worldstates.emplace_back(WORLD_STATE_HOR_WAVE_COUNT, _waveCount);
-            }
-
             bool SetBossState(uint32 type, EncounterState state) override
             {
                 if (!InstanceScript::SetBossState(type, state))
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index 21fb4a3b25c..8bab02e489d 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -29,7 +29,6 @@
 #include "TemporarySummon.h"
 #include "Transport.h"
 #include "TransportMgr.h"
-#include "WorldStatePackets.h"
 #include <sstream>
 #include <unordered_set>
 
@@ -177,15 +176,6 @@ class instance_icecrown_citadel : public InstanceMapScript
                 }
             }
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                packet.Worldstates.emplace_back(WORLDSTATE_SHOW_TIMER, BloodQuickeningState == IN_PROGRESS ? 1 : 0);
-                packet.Worldstates.emplace_back(WORLDSTATE_EXECUTION_TIME, BloodQuickeningMinutes);
-                packet.Worldstates.emplace_back(WORLDSTATE_SHOW_ATTEMPTS, instance->IsHeroic() ? 1 : 0);
-                packet.Worldstates.emplace_back(WORLDSTATE_ATTEMPTS_REMAINING, HeroicAttempts);
-                packet.Worldstates.emplace_back(WORLDSTATE_ATTEMPTS_MAX, MaxHeroicAttempts);
-            }
-
             void OnPlayerEnter(Player* player) override
             {
                 uint8 spawnGroupId = TeamInInstance == ALLIANCE ? SPAWN_GROUP_ALLIANCE_ROS : SPAWN_GROUP_HORDE_ROS;
diff --git a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
index 5d3bd684604..eeff191f6e9 100644
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -26,7 +26,6 @@
 #include "ScriptMgr.h"
 #include "PhasingHandler.h"
 #include "TemporarySummon.h"
-#include "WorldStatePackets.h"
 
 DoorData const doorData[] =
 {
@@ -152,20 +151,6 @@ class instance_oculus : public InstanceMapScript
                 }
             }
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                if (GetBossState(DATA_DRAKOS) == DONE && GetBossState(DATA_VAROS) != DONE)
-                {
-                    packet.Worldstates.emplace_back(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 1);
-                    packet.Worldstates.emplace_back(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, CentrifugueConstructCounter);
-                }
-                else
-                {
-                    packet.Worldstates.emplace_back(WORLD_STATE_CENTRIFUGE_CONSTRUCT_SHOW, 0);
-                    packet.Worldstates.emplace_back(WORLD_STATE_CENTRIFUGE_CONSTRUCT_AMOUNT, 0);
-                }
-            }
-
             void ProcessEvent(WorldObject* /*unit*/, uint32 eventId, WorldObject* /*invoker*/) override
             {
                 if (eventId != EVENT_CALL_DRAGON)
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
index 0699f4de443..4de37193895 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
@@ -143,7 +143,6 @@ enum Vehicles
 enum Misc
 {
     DATA_SHUTOUT               = 29112912, // 2911, 2912 are achievement IDs
-    DATA_ORBIT_ACHIEVEMENTS    = 1,
     VEHICLE_SPAWNS             = 5,
     FREYA_SPAWNS               = 4
 
@@ -351,10 +350,6 @@ class boss_flame_leviathan : public CreatureScript
                         return Shutout ? 1 : 0;
                     case DATA_UNBROKEN:
                         return Unbroken ? 1 : 0;
-                    case DATA_ORBIT_ACHIEVEMENTS:
-                        if (ActiveTowers) // Only on HardMode
-                            return ActiveTowersCount;
-                        break;
                     default:
                         break;
                 }
@@ -522,6 +517,7 @@ class boss_flame_leviathan : public CreatureScript
                         {
                             towerOfStorms = false;
                             --ActiveTowersCount;
+                            instance->DoUpdateWorldState(WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS, 4 - ActiveTowersCount);
                         }
                         break;
                     case ACTION_TOWER_OF_FROST_DESTROYED:
@@ -529,6 +525,7 @@ class boss_flame_leviathan : public CreatureScript
                         {
                             towerOfFrost = false;
                             --ActiveTowersCount;
+                            instance->DoUpdateWorldState(WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS, 4 - ActiveTowersCount);
                         }
                         break;
                     case ACTION_TOWER_OF_FLAMES_DESTROYED:
@@ -536,6 +533,7 @@ class boss_flame_leviathan : public CreatureScript
                         {
                             towerOfFlames = false;
                             --ActiveTowersCount;
+                            instance->DoUpdateWorldState(WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS, 4 - ActiveTowersCount);
                         }
                         break;
                     case ACTION_TOWER_OF_LIFE_DESTROYED:
@@ -543,9 +541,11 @@ class boss_flame_leviathan : public CreatureScript
                         {
                             towerOfLife = false;
                             --ActiveTowersCount;
+                            instance->DoUpdateWorldState(WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS, 4 - ActiveTowersCount);
                         }
                         break;
                     case ACTION_START_HARD_MODE:  // Activate hard-mode enable all towers, apply buffs on leviathan
+                        instance->DoUpdateWorldState(WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS, 0);
                         ActiveTowers = true;
                         towerOfStorms = true;
                         towerOfLife = true;
@@ -1422,78 +1422,6 @@ class achievement_unbroken : public AchievementCriteriaScript
         }
 };
 
-class achievement_orbital_bombardment : public AchievementCriteriaScript
-{
-    public:
-        achievement_orbital_bombardment() : AchievementCriteriaScript("achievement_orbital_bombardment") { }
-
-        bool OnCheck(Player* /*source*/, Unit* target) override
-        {
-            if (!target)
-                return false;
-
-            if (Creature* Leviathan = target->ToCreature())
-                if (Leviathan->AI()->GetData(DATA_ORBIT_ACHIEVEMENTS) >= 1)
-                    return true;
-
-            return false;
-        }
-};
-
-class achievement_orbital_devastation : public AchievementCriteriaScript
-{
-    public:
-        achievement_orbital_devastation() : AchievementCriteriaScript("achievement_orbital_devastation") { }
-
-        bool OnCheck(Player* /*source*/, Unit* target) override
-        {
-            if (!target)
-                return false;
-
-            if (Creature* Leviathan = target->ToCreature())
-                if (Leviathan->AI()->GetData(DATA_ORBIT_ACHIEVEMENTS) >= 2)
-                    return true;
-
-            return false;
-        }
-};
-
-class achievement_nuked_from_orbit : public AchievementCriteriaScript
-{
-    public:
-        achievement_nuked_from_orbit() : AchievementCriteriaScript("achievement_nuked_from_orbit") { }
-
-        bool OnCheck(Player* /*source*/, Unit* target) override
-        {
-            if (!target)
-                return false;
-
-            if (Creature* Leviathan = target->ToCreature())
-                if (Leviathan->AI()->GetData(DATA_ORBIT_ACHIEVEMENTS) >= 3)
-                    return true;
-
-            return false;
-        }
-};
-
-class achievement_orbit_uary : public AchievementCriteriaScript
-{
-    public:
-        achievement_orbit_uary() : AchievementCriteriaScript("achievement_orbit_uary") { }
-
-        bool OnCheck(Player* /*source*/, Unit* target) override
-        {
-            if (!target)
-                return false;
-
-            if (Creature* Leviathan = target->ToCreature())
-                if (Leviathan->AI()->GetData(DATA_ORBIT_ACHIEVEMENTS) == 4)
-                    return true;
-
-            return false;
-        }
-};
-
 // 62399 - Overload Circuit
 class spell_overload_circuit : public AuraScript
 {
@@ -1878,10 +1806,6 @@ void AddSC_boss_flame_leviathan()
     new achievement_three_car_garage_siege();
     new achievement_shutout();
     new achievement_unbroken();
-    new achievement_orbital_bombardment();
-    new achievement_orbital_devastation();
-    new achievement_nuked_from_orbit();
-    new achievement_orbit_uary();
 
     RegisterSpellScript(spell_overload_circuit);
     RegisterSpellScript(spell_tar_blaze);
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
index 2cac4d62bc0..ea4d81f5c97 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_razorscale.cpp
@@ -532,7 +532,7 @@ struct boss_razorscale : public BossAI
 
     void HandleMusic(bool active)
     {
-        uint32 enabled = active ? 1 : 0;
+        int32 enabled = active ? 1 : 0;
         instance->DoUpdateWorldState(WORLD_STATE_RAZORSCALE_MUSIC, enabled);
     }
 
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
index 15ab74477b5..1df315a7cc7 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -27,7 +27,6 @@
 #include "ScriptMgr.h"
 #include "TemporarySummon.h"
 #include "Vehicle.h"
-#include "WorldStatePackets.h"
 #include <sstream>
 
 static BossBoundaryData const boundaries =
@@ -226,13 +225,6 @@ class instance_ulduar : public InstanceMapScript
             bool Unbroken;
             bool IsDriveMeCrazyEligible;
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                packet.Worldstates.emplace_back(WORLD_STATE_YOGG_SARON_KEEPERS, int32(keepersCount));
-                packet.Worldstates.emplace_back(WORLD_STATE_ALGALON_TIMER_ENABLED, (_algalonTimer && _algalonTimer <= 60) ? 1 : 0);
-                packet.Worldstates.emplace_back(WORLD_STATE_ALGALON_DESPAWN_TIMER, std::min<int32>(_algalonTimer, 60));
-            }
-
             void OnPlayerEnter(Player* player) override
             {
                 if (!TeamInInstance)
@@ -359,24 +351,28 @@ class instance_ulduar : public InstanceMapScript
                         _summonYSKeeper[0] = false;
                         SaveToDB();
                         ++keepersCount;
+                        DoUpdateWorldState(WORLD_STATE_YOGG_SARON_KEEPERS, keepersCount);
                         break;
                     case NPC_HODIR_YS:
                         KeeperGUIDs[1] = creature->GetGUID();
                         _summonYSKeeper[1] = false;
                         SaveToDB();
                         ++keepersCount;
+                        DoUpdateWorldState(WORLD_STATE_YOGG_SARON_KEEPERS, keepersCount);
                         break;
                     case NPC_THORIM_YS:
                         KeeperGUIDs[2] = creature->GetGUID();
                         _summonYSKeeper[2] = false;
                         SaveToDB();
                         ++keepersCount;
+                        DoUpdateWorldState(WORLD_STATE_YOGG_SARON_KEEPERS, keepersCount);
                         break;
                     case NPC_MIMIRON_YS:
                         KeeperGUIDs[3] = creature->GetGUID();
                         _summonYSKeeper[3] = false;
                         SaveToDB();
                         ++keepersCount;
+                        DoUpdateWorldState(WORLD_STATE_YOGG_SARON_KEEPERS, keepersCount);
                         break;
                     case NPC_SANITY_WELL:
                         creature->SetReactState(REACT_PASSIVE);
@@ -885,19 +881,6 @@ class instance_ulduar : public InstanceMapScript
                     case CRITERIA_DRIVE_ME_CRAZY_10:
                     case CRITERIA_DRIVE_ME_CRAZY_25:
                         return IsDriveMeCrazyEligible;
-                    case CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_10:
-                    case CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_25:
-                        return keepersCount <= 3;
-                    case CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_10:
-                    case CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_25:
-                        return keepersCount <= 2;
-                    case CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_10:
-                    case CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_25:
-                        return keepersCount <= 1;
-                    case CRITERIA_ALONE_IN_THE_DARKNESS_10:
-                    case CRITERIA_ALONE_IN_THE_DARKNESS_25:
-                    case REALM_FIRST_DEATHS_DEMISE:
-                        return keepersCount == 0;
                     case CRITERIA_C_O_U_LEVIATHAN_10:
                     case CRITERIA_C_O_U_LEVIATHAN_25:
                         return (_CoUAchivePlayerDeathMask & (1 << DATA_FLAME_LEVIATHAN)) == 0;
diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
index 6d966c38e42..2056d438e7d 100644
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
@@ -357,18 +357,8 @@ enum UlduarAchievementCriteriaIds
     CRITERIA_WAITS_DREAMING_ICECROWN_10      = 10326,
     CRITERIA_DRIVE_ME_CRAZY_10               = 10185,
     CRITERIA_DRIVE_ME_CRAZY_25               = 10296,
-    CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_10 = 10410,
-    CRITERIA_THREE_LIGHTS_IN_THE_DARKNESS_25 = 10414,
-    CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_10   = 10388,
-    CRITERIA_TWO_LIGHTS_IN_THE_DARKNESS_25   = 10415,
-    CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_10    = 10409,
-    CRITERIA_ONE_LIGHT_IN_THE_DARKNESS_25    = 10416,
-    CRITERIA_ALONE_IN_THE_DARKNESS_10        = 10412,
-    CRITERIA_ALONE_IN_THE_DARKNESS_25        = 10417,
     CRITERIA_HERALD_OF_TITANS                = 10678,
 
-    REALM_FIRST_DEATHS_DEMISE                = 10279,
-
     // Champion of Ulduar
     CRITERIA_C_O_U_LEVIATHAN_10              = 10042,
     CRITERIA_C_O_U_IGNIS_10                  = 10342,
@@ -477,9 +467,10 @@ enum UlduarData
 
 enum UlduarWorldStates
 {
-    WORLD_STATE_YOGG_SARON_KEEPERS      = 4116,
-    WORLD_STATE_ALGALON_DESPAWN_TIMER   = 4131,
-    WORLD_STATE_ALGALON_TIMER_ENABLED   = 4132,
+    WORLD_STATE_FLAME_LEVIATHAN_DESTROYED_TOWERS    = 4129,
+    WORLD_STATE_YOGG_SARON_KEEPERS                  = 4116,
+    WORLD_STATE_ALGALON_DESPAWN_TIMER               = 4131,
+    WORLD_STATE_ALGALON_TIMER_ENABLED               = 5636,
 };
 
 enum UlduarAchievementData
diff --git a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
index 8f1416766e9..58723958ed4 100644
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -26,7 +26,6 @@
 #include "TaskScheduler.h"
 #include "ScriptMgr.h"
 #include "TemporarySummon.h"
-#include "WorldStatePackets.h"
 #include <sstream>
 
 /*
@@ -293,13 +292,6 @@ class instance_violet_hold : public InstanceMapScript
                 }
             }
 
-            void FillInitialWorldStates(WorldPackets::WorldState::InitWorldStates& packet) override
-            {
-                packet.Worldstates.emplace_back(WORLD_STATE_VH_SHOW, EventState == IN_PROGRESS ? 1 : 0);
-                packet.Worldstates.emplace_back(WORLD_STATE_VH_PRISON_STATE, DoorIntegrity);
-                packet.Worldstates.emplace_back(WORLD_STATE_VH_WAVE_COUNT, WaveCount);
-            }
-
             bool CheckRequiredBosses(uint32 bossId, Player const* player = nullptr) const override
             {
                 if (_SkipCheckRequiredBosses(player))