From 249cc2b83cbea0b505e3c1f7e022ea5a61703dca Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 13 Jul 2022 18:09:42 -0400 Subject: [PATCH] Core/WorldStates: Migrate remaining hardcoded worldstates from Player::SendInitWorldStates to new system Port From (https://github.com/TrinityCore/TrinityCore/commit/e1effd961dee05420d19699eeac8e2bb2585c237) --- Source/Game/Entities/Player/Player.cs | 7 ------- sql/updates/world/master/2022_07_11_03_world.sql | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 sql/updates/world/master/2022_07_11_03_world.sql diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 09ab6818e..4c20e7d78 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -2913,13 +2913,6 @@ namespace Game.Entities Global.WorldStateMgr.FillInitialWorldStates(packet, GetMap(), areaId); - packet.AddState(2264, 0); // SCOURGE_EVENT_WORLDSTATE_EASTERN_PLAGUELANDS - packet.AddState(2263, 0); // SCOURGE_EVENT_WORLDSTATE_TANARIS - packet.AddState(2262, 0); // SCOURGE_EVENT_WORLDSTATE_BURNING_STEPPES - packet.AddState(2261, 0); // SCOURGE_EVENT_WORLDSTATE_BLASTED_LANDS - packet.AddState(2260, 0); // SCOURGE_EVENT_WORLDSTATE_AZSHARA - packet.AddState(2259, 0); // SCOURGE_EVENT_WORLDSTATE_WINTERSPRING - SendPacket(packet); } diff --git a/sql/updates/world/master/2022_07_11_03_world.sql b/sql/updates/world/master/2022_07_11_03_world.sql new file mode 100644 index 000000000..6c457f85b --- /dev/null +++ b/sql/updates/world/master/2022_07_11_03_world.sql @@ -0,0 +1,8 @@ +DELETE FROM `world_state` WHERE `ID` IN (2259,2260,2261,2262,2263,2264); +INSERT INTO `world_state` (`ID`,`DefaultValue`,`MapIDs`,`AreaIDs`,`ScriptName`,`Comment`) VALUES +(2259,0,NULL,NULL,'','Scourge Invasion - Winterspring Under Attack'), +(2260,0,NULL,NULL,'','Scourge Invasion - Azshara Under Attack'), +(2261,0,NULL,NULL,'','Scourge Invasion - Blasted Lands Under Attack'), +(2262,0,NULL,NULL,'','Scourge Invasion - Burning Steppes Under Attack'), +(2263,0,NULL,NULL,'','Scourge Invasion - Tanaris Under Attack'), +(2264,0,NULL,NULL,'','Scourge Invasion - Eastern Plaguelands Under Attack');