nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 18:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/WorldState): Initial addition of world state definition file. (#21875)

Browse Source 
Many world states had their enums from script's header and hardcoded values to their respective header file (WorldStateDefines.h)
Co-authored-by: Jelle Meeus <sogladev@gmail.com>
This commit is contained in:
Benjamin Jackson
2025-04-26 14:31:30 -04:00
committed by GitHub
parent d23e61b721
commit da55f05cfc
73 changed files with 1828 additions and 1789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
View File

@@ -21,6 +21,7 @@
#include "ScriptedGossip.h"
#include "SpellScript.h"
#include "SpellScriptLoader.h"
#include "WorldStateDefines.h"
enum LightOfDawnSays
{
@@ -198,13 +199,6 @@ enum LightOfDawnEncounter
ENCOUNTER_TOTAL_DEFENDERS = 300,
ENCOUNTER_TOTAL_SCOURGE = 10000,
WORLD_STATE_DEFENDERS_COUNT = 3590,
WORLD_STATE_SCOURGE_COUNT = 3591,
WORLD_STATE_SOLDIERS_ENABLE = 3592,
WORLD_STATE_COUNTDOWN_ENABLE = 3603,
WORLD_STATE_COUNTDOWN_TIME = 3604,
WORLD_STATE_EVENT_BEGIN_ENABLE = 3605,
ENCOUNTER_STATE_NONE = 0,
ENCOUNTER_STATE_FIGHT = 1,
ENCOUNTER_STATE_OUTRO = 2,
@@ -343,7 +337,7 @@ public:
if (creature->IsQuestGiver())
player->PrepareQuestMenu(creature->GetGUID());
if (player->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE && !creature->AI()->GetData(WORLD_STATE_SOLDIERS_ENABLE))
if (player->GetQuestStatus(12801) == QUEST_STATUS_INCOMPLETE && !creature->AI()->GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SOLDIERS_ENABLE))
AddGossipItemFor(player, 9795, 0, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
SendGossipMenuFor(player, player->GetGossipTextId(creature), creature->GetGUID());
@@ -414,17 +408,17 @@ public:
{
switch (type)
{
case WORLD_STATE_DEFENDERS_COUNT:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_DEFENDERS_COUNT:
return defendersRemaining;
case WORLD_STATE_SCOURGE_COUNT:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SCOURGE_COUNT:
return scourgeRemaining;
case WORLD_STATE_SOLDIERS_ENABLE:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SOLDIERS_ENABLE:
return me->IsAlive() && (startTimeRemaining || battleStarted);
case WORLD_STATE_COUNTDOWN_ENABLE:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_ENABLE:
return me->IsAlive() && startTimeRemaining;
case WORLD_STATE_COUNTDOWN_TIME:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME:
return startTimeRemaining;
case WORLD_STATE_EVENT_BEGIN_ENABLE:
case WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_EVENT_BEGIN_ENABLE:
return me->IsAlive() && !startTimeRemaining && battleStarted;
}
return 0;
@@ -442,12 +436,12 @@ public:
void SendInitialWorldStates()
{
SendUpdateWorldState(WORLD_STATE_DEFENDERS_COUNT, GetData(WORLD_STATE_DEFENDERS_COUNT));
SendUpdateWorldState(WORLD_STATE_SCOURGE_COUNT, GetData(WORLD_STATE_SCOURGE_COUNT));
SendUpdateWorldState(WORLD_STATE_SOLDIERS_ENABLE, GetData(WORLD_STATE_SOLDIERS_ENABLE));
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_ENABLE, GetData(WORLD_STATE_COUNTDOWN_ENABLE));
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, GetData(WORLD_STATE_COUNTDOWN_TIME));
SendUpdateWorldState(WORLD_STATE_EVENT_BEGIN_ENABLE, GetData(WORLD_STATE_EVENT_BEGIN_ENABLE));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_DEFENDERS_COUNT, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_DEFENDERS_COUNT));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SCOURGE_COUNT, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SCOURGE_COUNT));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SOLDIERS_ENABLE, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SOLDIERS_ENABLE));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_ENABLE, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_ENABLE));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_EVENT_BEGIN_ENABLE, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_EVENT_BEGIN_ENABLE));
}
void JustSummoned(Creature* cr) override
@@ -482,12 +476,12 @@ public:
if (creature->GetEntry() >= NPC_RAMPAGING_ABOMINATION)
{
--scourgeRemaining;
SendUpdateWorldState(WORLD_STATE_SCOURGE_COUNT, GetData(WORLD_STATE_SCOURGE_COUNT));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SCOURGE_COUNT, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_SCOURGE_COUNT));
}
else
{
--defendersRemaining;
SendUpdateWorldState(WORLD_STATE_DEFENDERS_COUNT, GetData(WORLD_STATE_DEFENDERS_COUNT));
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_DEFENDERS_COUNT, GetData(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_DEFENDERS_COUNT));
if (defendersRemaining == 200)
FinishFight();
@@ -610,25 +604,25 @@ public:
switch (eventId)
{
case EVENT_START_COUNTDOWN_1:
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, 4);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, 4);
break;
case EVENT_START_COUNTDOWN_2:
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, 3);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, 3);
break;
case EVENT_START_COUNTDOWN_3:
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, 2);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, 2);
break;
case EVENT_START_COUNTDOWN_4:
Talk(SAY_LIGHT_OF_DAWN02);
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, 1);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, 1);
break;
case EVENT_START_COUNTDOWN_5:
battleStarted = ENCOUNTER_STATE_FIGHT;
me->ReplaceAllNpcFlags(UNIT_NPC_FLAG_NONE);
Talk(SAY_LIGHT_OF_DAWN04); // Wrong order in DB!
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_TIME, 0);
SendUpdateWorldState(WORLD_STATE_COUNTDOWN_ENABLE, 0);
SendUpdateWorldState(WORLD_STATE_EVENT_BEGIN_ENABLE, 1);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_TIME, 0);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_COUNTDOWN_ENABLE, 0);
SendUpdateWorldState(WORLD_STATE_BATTLE_FOR_LIGHTS_HOPE_EVENT_BEGIN_ENABLE, 1);
break;
case EVENT_START_COUNTDOWN_6:
case EVENT_START_COUNTDOWN_7:

21
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
View File

@@ -19,13 +19,12 @@
#include "InstanceScript.h"
#include "Player.h"
#include "TemporarySummon.h"
#include "WorldStateDefines.h"
#include "zulaman.h"
enum Misc
{
RAND_VENDOR = 2,
WORLDSTATE_SHOW_TIMER = 3104,
WORLDSTATE_TIME_TO_SACRIFICE = 3106
RAND_VENDOR = 2,
};
// Chests spawn at bear/eagle/dragonhawk/lynx bosses
@@ -175,8 +174,8 @@ public:
{
if (uint32 timer = GetPersistentData(DATA_TIMED_RUN))
{
DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1);
DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, timer);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_SHOW_TIMER, 1);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_TIME_TO_SACRIFICE, timer);
}
scheduler.Schedule(1min, GROUP_TIMED_RUN, [this](TaskContext context)
@@ -184,13 +183,13 @@ public:
if (uint32 timer = GetPersistentData(DATA_TIMED_RUN))
{
--timer;
DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 1);
DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, timer);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_SHOW_TIMER, 1);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_TIME_TO_SACRIFICE, timer);
StorePersistentData(DATA_TIMED_RUN, timer);
context.Repeat();
}
else
DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_SHOW_TIMER, 0);
});
}
}
@@ -303,7 +302,7 @@ public:
if (uint32 timer = GetPersistentData(DATA_TIMED_RUN))
{
StorePersistentData(DATA_TIMED_RUN, timer += 15);
DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, timer);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_TIME_TO_SACRIFICE, timer);
}
SummonHostage(type);
break;
@@ -311,7 +310,7 @@ public:
if (uint32 timer = GetPersistentData(DATA_TIMED_RUN))
{
StorePersistentData(DATA_TIMED_RUN, timer += 10);
DoUpdateWorldState(WORLDSTATE_TIME_TO_SACRIFICE, timer);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_TIME_TO_SACRIFICE, timer);
}
SummonHostage(type);
break;
@@ -328,7 +327,7 @@ public:
if (GetPersistentData(DATA_TIMED_RUN) && AllBossesDone({ DATA_NALORAKK, DATA_AKILZON, DATA_JANALAI, DATA_HALAZZI }))
{
StorePersistentData(DATA_TIMED_RUN, 0);
DoUpdateWorldState(WORLDSTATE_SHOW_TIMER, 0);
DoUpdateWorldState(WORLD_STATE_ZUL_AMAN_SHOW_TIMER, 0);
}
CheckInstanceStatus();

84
src/server/scripts/EasternKingdoms/zone_undercity.cpp
View File

@@ -37,6 +37,7 @@ EndContentData */
#include "SpellAuraEffects.h"
#include "SpellScript.h"
#include "SpellScriptLoader.h"
#include "WorldStateDefines.h"
/*######
## npc_lady_sylvanas_windrunner
@@ -723,31 +724,6 @@ enum QuestMisc
ZONE_UNDERCITY = 1497
};
enum Worldstates
{
// Alliance
WORLD_STATE_MANHUNT_COUNTDOWN_A = 3958,
WORLD_STATE_MANHUNT_STARTS_A = 3966,
WORLD_STATE_SEWERS_FIGHT_A = 3962,
WORLD_STATE_SEWERS_DONE_A = 3964,
WORLD_STATE_APOTHECARIUM_FIGHT_A = 3972,
WORLD_STATE_APOTHECARIUM_DONE_A = 3971,
WORLD_STATE_FAIL_A = 3963,
// Horde
WORLD_STATE_BATTLE_COUNTDOWN_H = 3876,
WORLD_STATE_BATTLE_START_H = 3875,
WORLD_STATE_COURTYARD_FIGHT_H = 3885,
WORLD_STATE_COURTYARD_DONE_H = 3886,
WORLD_STATE_INNER_SANKTUM_FIGHT_H = 3887,
WORLD_STATE_INNER_SANKTUM_DONE_H = 3888,
WORLD_STATE_APOTHECARIUM_FIGHT_H = 3891, // unused
WORLD_STATE_APOTHECARIUM_DONE_H = 3892, // unused
WORLD_STATE_ROYAL_QUARTER_FIGHT_H = 3889,
WORLD_STATE_ROYAL_QUARTER_DONE_H = 3890,
WORLD_STATE_FAIL_H = 3878
};
struct LocationXYZO {
float x, y, z, o;
};
@@ -1131,13 +1107,13 @@ public:
switch (summon->GetEntry())
{
case NPC_BLIGHTWORM:
UpdateWorldState(me->GetMap(), WORLD_STATE_SEWERS_FIGHT_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_SEWERS_DONE_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_SEWERS_FIGHT_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_SEWERS_DONE_A, 1);
bStepping = true;
break;
case NPC_PUTRESS:
UpdateWorldState(me->GetMap(), WORLD_STATE_APOTHECARIUM_FIGHT_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_APOTHECARIUM_DONE_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_APOTHECARIUM_FIGHT_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_APOTHECARIUM_DONE_A, 1);
bStepping = true;
break;
default:
@@ -1536,7 +1512,7 @@ public:
//Preparation
case 0:
me->setActive(true);
UpdateWorldState(me->GetMap(), WORLD_STATE_MANHUNT_COUNTDOWN_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_MANHUNT_COUNTDOWN_A, 1);
Talk(WRYNN_SAY_PREP_1);
JumpToNextStep(10 * IN_MILLISECONDS);
break;
@@ -1553,8 +1529,8 @@ public:
JumpToNextStep(20 * IN_MILLISECONDS);
break;
case 4:
UpdateWorldState(me->GetMap(), WORLD_STATE_MANHUNT_COUNTDOWN_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_MANHUNT_STARTS_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_MANHUNT_COUNTDOWN_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_MANHUNT_STARTS_A, 1);
Talk(WRYNN_SAY_PREP_5);
JumpToNextStep(10 * IN_MILLISECONDS);
break;
@@ -1600,8 +1576,8 @@ public:
break;
case 12:
SetEscortPaused(false);
UpdateWorldState(me->GetMap(), WORLD_STATE_MANHUNT_STARTS_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_SEWERS_FIGHT_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_MANHUNT_STARTS_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_SEWERS_FIGHT_A, 1);
JumpToNextStep(1 * IN_MILLISECONDS);
break;
case 13:
@@ -1692,7 +1668,7 @@ public:
JumpToNextStep(1.5 * IN_MILLISECONDS);
break;
case 30:
UpdateWorldState(me->GetMap(), WORLD_STATE_APOTHECARIUM_FIGHT_A, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_APOTHECARIUM_FIGHT_A, 1);
if (Creature* putress = ObjectAccessor::GetCreature(*me, putressGUID))
putress->AI()->Talk(PUTRESS_SAY_1);
if (Player* player = GetPlayerForEscort())
@@ -2018,9 +1994,9 @@ public:
}
}
}
UpdateWorldState(me->GetMap(), WORLD_STATE_MANHUNT_STARTS_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_SEWERS_DONE_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_APOTHECARIUM_DONE_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_MANHUNT_STARTS_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_SEWERS_DONE_A, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_APOTHECARIUM_DONE_A, 0);
me->DespawnOrUnsummon();
break;
}
@@ -2471,14 +2447,14 @@ public:
switch (summon->GetEntry())
{
case NPC_BLIGHT_ABBERATION:
UpdateWorldState(me->GetMap(), WORLD_STATE_COURTYARD_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_COURTYARD_DONE_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COURTYARD_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COURTYARD_DONE_H, 1);
bStepping = true;
break;
case NPC_KHANOK:
{
UpdateWorldState(me->GetMap(), WORLD_STATE_INNER_SANKTUM_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_INNER_SANKTUM_DONE_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_INNER_SANCTUM_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_INNER_SANCTUM_DONE_H, 1);
FollowThrall();
SetEscortPaused(false);
std::list<Creature*> SanktumList;
@@ -2497,8 +2473,8 @@ public:
}
case NPC_VARIMATHRAS:
{
UpdateWorldState(me->GetMap(), WORLD_STATE_ROYAL_QUARTER_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_ROYAL_QUARTER_DONE_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_ROYAL_QUARTER_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_ROYAL_QUARTER_DONE_H, 1);
std::list<Creature*> ThroneList;
me->GetCreatureListWithEntryInGrid(ThroneList, NPC_LEGION_OVERLORD, 1000.0f);
me->GetCreatureListWithEntryInGrid(ThroneList, NPC_LEGION_INVADER, 1000.0f);
@@ -2874,7 +2850,7 @@ public:
break;
case 36:
Talk(THRALL_SAY_SANCTUM_1);
UpdateWorldState(me->GetMap(), WORLD_STATE_INNER_SANKTUM_FIGHT_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_ROYAL_QUARTER_FIGHT_H, 1);
break;
case 46:
SetHoldState(true);
@@ -2951,7 +2927,7 @@ public:
JumpToNextStep(3 * IN_MILLISECONDS);
break;
case 1:
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_COUNTDOWN_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COUNTDOWN_H, 1);
Talk(THRALL_SAY_PREP_1);
JumpToNextStep(6 * IN_MILLISECONDS);
break;
@@ -2995,8 +2971,8 @@ public:
break;
// Start Event
case 11:
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_COUNTDOWN_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_START_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COUNTDOWN_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_START_H, 1);
Talk(THRALL_SAY_PREP_8);
SetEscortPaused(false);
bStepping = false;
@@ -3108,8 +3084,8 @@ public:
bStepping = false;
SetRun(true);
Talk(THRALL_SAY_COURTYARD_4);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_START_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_COURTYARD_FIGHT_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_START_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COURTYARD_FIGHT_H, 1);
JumpToNextStep(0);
break;
case 28:
@@ -3548,7 +3524,7 @@ public:
}
case 116:
Talk(THRALL_SAY_SANCTUM_7);
UpdateWorldState(me->GetMap(), WORLD_STATE_ROYAL_QUARTER_FIGHT_H, 1);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_ROYAL_QUARTER_FIGHT_H, 1);
FollowThrall();
SetEscortPaused(false);
bStepping = false;
@@ -3885,9 +3861,9 @@ public:
me->SetNpcFlag(UNIT_NPC_FLAG_GOSSIP);
me->SetNpcFlag(UNIT_NPC_FLAG_QUESTGIVER);
Talk(THRALL_SAY_THRONE_11);
UpdateWorldState(me->GetMap(), WORLD_STATE_ROYAL_QUARTER_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_INNER_SANKTUM_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_COURTYARD_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_ROYAL_QUARTER_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_INNER_SANCTUM_FIGHT_H, 0);
UpdateWorldState(me->GetMap(), WORLD_STATE_BATTLE_FOR_UNDERCITY_COURTYARD_FIGHT_H, 0);
std::list<Creature*> HelperList;
me->GetCreatureListWithEntryInGrid(HelperList, NPC_SYLVANAS, 100.0f);
me->GetCreatureListWithEntryInGrid(HelperList, NPC_OVERLORD_SAURFANG, 100.0f);