From 57d3221a93b380b95cc74d21de6c62ba71ae1988 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 29 Jun 2022 11:06:53 -0400 Subject: [PATCH] Some misc fixes --- Source/Game/Handlers/SpellHandler.cs | 2 +- Source/Game/Spells/Auras/AuraEffect.cs | 2 +- Source/Game/World/WorldStateManager.cs | 2 +- .../world/master/2022_06_27_00_world.sql | 55 +++++++++++++++++++ 4 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 sql/updates/world/master/2022_06_27_00_world.sql diff --git a/Source/Game/Handlers/SpellHandler.cs b/Source/Game/Handlers/SpellHandler.cs index 306c60dbf..db9f38f90 100644 --- a/Source/Game/Handlers/SpellHandler.cs +++ b/Source/Game/Handlers/SpellHandler.cs @@ -457,7 +457,7 @@ namespace Game pet.RemoveOwnedAura(packet.SpellID, ObjectGuid.Empty, 0, AuraRemoveMode.Cancel); } - [WorldPacketHandler(ClientOpcodes.CancelAutoRepeatSpell, Processing = PacketProcessing.Inplace)] + [WorldPacketHandler(ClientOpcodes.CancelModSpeedNoControlAuras, Processing = PacketProcessing.Inplace)] void HandleCancelModSpeedNoControlAuras(CancelModSpeedNoControlAuras cancelModSpeedNoControlAuras) { Unit mover = _player.GetUnitBeingMoved(); diff --git a/Source/Game/Spells/Auras/AuraEffect.cs b/Source/Game/Spells/Auras/AuraEffect.cs index 2a4de1b5c..49d83e466 100644 --- a/Source/Game/Spells/Auras/AuraEffect.cs +++ b/Source/Game/Spells/Auras/AuraEffect.cs @@ -2318,7 +2318,7 @@ namespace Game.Spells target.SetIgnoreMovementForces(apply); } - [AuraEffectHandler(AuraType.IgnoreMovementForces)] + [AuraEffectHandler(AuraType.DisableInertia)] void HandleDisableInertia(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply) { if (!mode.HasFlag(AuraEffectHandleModes.SendForClientMask)) diff --git a/Source/Game/World/WorldStateManager.cs b/Source/Game/World/WorldStateManager.cs index 6ec948d99..b92097f25 100644 --- a/Source/Game/World/WorldStateManager.cs +++ b/Source/Game/World/WorldStateManager.cs @@ -76,7 +76,7 @@ namespace Game } string areaIds = result.Read(3); - if (!worldState.MapIds.Empty()) + if (!areaIds.IsEmpty() && !worldState.MapIds.Empty()) { foreach (string areaIdToken in new StringArray(areaIds, ',')) { diff --git a/sql/updates/world/master/2022_06_27_00_world.sql b/sql/updates/world/master/2022_06_27_00_world.sql new file mode 100644 index 000000000..1b533f24d --- /dev/null +++ b/sql/updates/world/master/2022_06_27_00_world.sql @@ -0,0 +1,55 @@ +DELETE FROM `world_state` WHERE `ID` IN (5332,5333,5334,5344,5346,5347,5348,5349,5350,5384,5385,5387,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440,5441,5442,5443,5444,5445,5446,5447,5451,5452,5453,5454,5455,5456,5469,5470,5546,5547,5684); +INSERT INTO `world_state` (`ID`, `DefaultValue`, `MapIDs`, `AreaIDs`, `ScriptName`, `Comment`) VALUES +(5332, 0, '732', '5095,5389', '', 'Tol Barad - Next battle start time'), +(5333, 0, '732', '5095', '', 'Tol Barad - Battle end time'), +(5334, 0, '732', '5095,5389', '', 'Tol Barad - Controlling faction'), +(5344, 0, '732', '5095', '', 'Tol Barad - In progress'), +(5346, 0, '732', '5095', '', 'Tol Barad - Show timer to battle end'), +(5347, 0, '732', '5095', '', 'Tol Barad - Number of destroyed towers'), +(5348, 0, '732', '5095', '', 'Tol Barad - Number of captured buildings'), +(5349, 0, '732', '5095', '', 'Tol Barad - Show number of captured buildings'), +(5350, 0, '732', '5095', '', 'Tol Barad - Show number of destroyed towers'), +(5384, 0, '732', '5095,5389', '', 'Tol Barad - Show if Horde is controlling'), +(5385, 0, '732', '5095,5389', '', 'Tol Barad - Show if Alliance is controlling'), +(5387, 0, '732', '5095,5389', '', 'Tol Barad - Show timer for next battle'), +(5418, 0, '732', '5095', '', 'Tol Barad - Ironclad Garrison controlled by Horde'), +(5419, 0, '732', '5095', '', 'Tol Barad - Ironclad Garrison being captured by Horde'), +(5420, 0, '732', '5095', '', 'Tol Barad - Ironclad Garrison neutral'), +(5421, 0, '732', '5095', '', 'Tol Barad - Ironclad Garrison being captured by Alliance'), +(5422, 0, '732', '5095', '', 'Tol Barad - Ironclad Garrison controlled by Alliance'), +(5423, 0, '732', '5095', '', 'Tol Barad - Warden\'s Vigil controlled by Horde'), +(5424, 0, '732', '5095', '', 'Tol Barad - Warden\'s Vigil being captured by Horde'), +(5425, 0, '732', '5095', '', 'Tol Barad - Warden\'s Vigil neutral'), +(5426, 0, '732', '5095', '', 'Tol Barad - Warden\'s Vigil being captured by Alliance'), +(5427, 0, '732', '5095', '', 'Tol Barad - Warden\'s Vigil controlled by Alliance'), +(5428, 0, '732', '5095', '', 'Tol Barad - Slagworks controlled by Horde'), +(5429, 0, '732', '5095', '', 'Tol Barad - Slagworks being captured by Horde'), +(5430, 0, '732', '5095', '', 'Tol Barad - Slagworks neutral'), +(5431, 0, '732', '5095', '', 'Tol Barad - Slagworks being captured by Alliance'), +(5432, 0, '732', '5095', '', 'Tol Barad - Slagworks controlled by Alliance'), +(5433, 0, '732', '5095', '', 'Tol Barad - West Spire Horde controlled'), +(5434, 0, '732', '5095', '', 'Tol Barad - West Spire Horde controlled, damaged'), +(5435, 0, '732', '5095', '', 'Tol Barad - West Spire destroyed'), +(5436, 0, '732', '5095', '', 'Tol Barad - West Spire Alliance controlled'), +(5437, 0, '732', '5095', '', 'Tol Barad - West Spire Alliance controlled, damaged'), +(5438, 0, '732', '5095', '', 'Tol Barad - South Spire Horde controlled'), +(5439, 0, '732', '5095', '', 'Tol Barad - South Spire Horde controlled, damaged'), +(5440, 0, '732', '5095', '', 'Tol Barad - South Spire destroyed'), +(5441, 0, '732', '5095', '', 'Tol Barad - South Spire Alliance controlled'), +(5442, 0, '732', '5095', '', 'Tol Barad - South Spire Alliance controlled, damaged'), +(5443, 0, '732', '5095', '', 'Tol Barad - East Spire Horde controlled'), +(5444, 0, '732', '5095', '', 'Tol Barad - East Spire Horde controlled, damaged'), +(5445, 0, '732', '5095', '', 'Tol Barad - East Spire destroyed'), +(5446, 0, '732', '5095', '', 'Tol Barad - East Spire Alliance controlled'), +(5447, 0, '732', '5095', '', 'Tol Barad - East Spire Alliance controlled, damaged'), +(5451, 0, '732', '5095', '', 'Tol Barad - East Spire uncontrolled'), +(5452, 0, '732', '5095', '', 'Tol Barad - East Spire damaged'), +(5453, 0, '732', '5095', '', 'Tol Barad - West Spire uncontrolled'), +(5454, 0, '732', '5095', '', 'Tol Barad - West Spire damaged'), +(5455, 0, '732', '5095', '', 'Tol Barad - South Spire uncontrolled'), +(5456, 0, '732', '5095', '', 'Tol Barad - South Spire damaged'), +(5469, 0, '732', '5095', '', 'Tol Barad - Baradin Hold controlled by Horde'), +(5470, 0, '732', '5095', '', 'Tol Barad - Baradin Hold controlled by Alliance'), +(5546, 0, '732', '5095,5389', '', 'Tol Barad - Show if Alliance is attacking'), +(5547, 0, '732', '5095,5389', '', 'Tol Barad - Show if Horde is attacking'), +(5684, 0, '732', '5095', '', 'Tol Barad - Preparation');