Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

github-actions[bot] · github-actions[bot] · commit 83b6beef3ff2 · 2026-05-18T03:32:00.000Z
diff --git a/data/sql/updates/db_auth/2026_05_17_00.sql b/data/sql/updates/db_auth/2026_05_17_00.sql
@@ -0,0 +1,35 @@
+-- DB update 2026_05_14_00 -> 2026_05_17_00
+-- Split RBAC_PERM_COMMAND_DEBUG (300) into three permission tiers:
+--
+--   300 (Command: debug)           -- state-modifying commands (unchanged)
+--   920 (Command: debug info)      -- read-only / informational commands
+--   921 (Command: debug cosmetic)  -- client-side / cosmetic commands
+--
+-- Backward compatibility: perm 300 links to both 920 and 921, so any account
+-- or role that already held perm 300 automatically receives the new sub-perms
+-- via RBAC expansion. No existing setups are affected.
+--
+-- Informational (920): threat, threatinfo, combat, hostile, getvalue,
+--   getitemvalue, getitemstate, lootrecipient, los, loot, visibilitydata,
+--   objectcount, mapdata, factionchange, zonestats
+--
+-- Cosmetic (921): play *, send (all except opcode/setphaseshift), anim,
+--   areatriggers, boundary, wpgps
+--
+-- State-modifying (300, unchanged): setbit, Mod32Value, setaurastate,
+--   setitemvalue, setvalue, spawnvehicle, setvid, entervehicle, uws, update,
+--   itemexpire, arena, bg, lfg, cooldown, moveflags, unitstate, dummy,
+--   send opcode, send setphaseshift
+
+DELETE FROM `rbac_permissions` WHERE `id` IN (920, 921);
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(920, 'Command: debug info'),
+(921, 'Command: debug cosmetic');
+
+-- Existing holders of perm 300 automatically receive both new sub-perms.
+-- Role 197 (GM Commands) already includes perm 300, so it reaches 920 and 921
+-- transitively — no direct links to role 197 are needed or added.
+DELETE FROM `rbac_linked_permissions` WHERE `id` = 300 AND `linkedId` IN (920, 921);
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(300, 920),
+(300, 921);
diff --git a/data/sql/updates/db_world/2026_05_17_00.sql b/data/sql/updates/db_world/2026_05_17_00.sql
@@ -0,0 +1,4 @@
+-- DB update 2026_05_16_02 -> 2026_05_17_00
+DELETE FROM `spell_proc` WHERE `SpellId` = 20178;
+INSERT INTO `spell_proc` (`SpellId`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `ProcFlags`, `SpellTypeMask`, `SpellPhaseMask`, `HitMask`, `AttributesMask`, `DisableEffectsMask`, `ProcsPerMinute`, `Chance`, `Cooldown`, `Charges`) VALUES
+(20178, 0, 0, 0, 0, 0, 0x4, 0, 0, 0x2477, 0, 0, 0, 100, 0, 4);
diff --git a/data/sql/updates/db_world/2026_05_17_01.sql b/data/sql/updates/db_world/2026_05_17_01.sql
@@ -0,0 +1,10 @@
+-- DB update 2026_05_17_00 -> 2026_05_17_01
+DELETE FROM `command` WHERE `name` IN ('debug combat','debug threatinfo','pdump copy','pet delete','pet list','rbac list','reload rbac');
+INSERT INTO `command` (`name`,`security`,`help`) VALUES
+('debug combat',3,'Syntax: .debug combat\nLists PvP and PvE combat references of the selected unit (or self).'),
+('debug threatinfo',3,'Syntax: .debug threatinfo\nDisplays various debug information about the target''s threat state, modifiers, redirects and similar.'),
+('pdump copy',3,'Syntax: .pdump copy $playerNameOrGUID $account [$newname] [$newguid]\nCopy character with name/guid $playerNameOrGUID into character list of $account with $newname, with first free or $newguid guid.'),
+('pet delete',3,'Syntax: .pet delete $playerNameOrGUID #petNumber\nDeletes the pet with the given pet number belonging to the specified player.'),
+('pet list',1,'Syntax: .pet list $playerNameOrGUID\nLists all pets owned by the specified player (id, entry, level, slot, name, type).'),
+('rbac list',3,'Syntax: .rbac list [#id]\nView list of all permissions. If #id is given will show only info for that permission.'),
+('reload rbac',3,'Syntax: .reload rbac\nReload rbac system.');
diff --git a/data/sql/updates/db_world/2026_05_17_02.sql b/data/sql/updates/db_world/2026_05_17_02.sql
@@ -0,0 +1,2 @@
+-- DB update 2026_05_17_01 -> 2026_05_17_02
+UPDATE `smart_scripts` SET `action_param6` = 2 WHERE `entryorguid` IN (17809, 17810, 17811, 17812) AND `source_type` = 0 AND `action_type` = 53;
diff --git a/data/sql/updates/db_world/2026_05_17_03.sql b/data/sql/updates/db_world/2026_05_17_03.sql
@@ -0,0 +1,9 @@
+-- DB update 2026_05_17_02 -> 2026_05_17_03
+DELETE FROM `item_loot_template` WHERE (`Entry` = 41888) AND (`Item` IN (41450, 41452, 41466, 41468, 41492, 41497));
+INSERT INTO `item_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(41888, 41450, 0, 16.9, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Balanced Shadow Crystal'),
+(41888, 41452, 0, 16.9, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Glowing Shadow Crystal'),
+(41888, 41466, 0, 17.7, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Forceful Dark Jade'),
+(41888, 41468, 0, 16.3, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Jagged Dark Jade'),
+(41888, 41492, 0, 13, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Inscribed Huge Citrine'),
+(41888, 41497, 0, 19.3, 0, 1, 1, 1, 1, 'Small Velvet Bag - Perfect Reckless Huge Citrine');
diff --git a/data/sql/updates/db_world/2026_05_17_04.sql b/data/sql/updates/db_world/2026_05_17_04.sql
@@ -0,0 +1,51 @@
+-- DB update 2026_05_17_03 -> 2026_05_17_04
+--
+-- Griselda Hunderland → Talker: 26043
+DELETE FROM `creature_text` WHERE (`CreatureID` = 26043);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(26043, 0, 0, 'Greetings, $c.', 12, 0, 100, 3, 0, 0, 32808, 0, 'Griselda Hunderland'),
+(26043, 0, 1, 'Let me know if you need help finding anything, $c.', 12, 0, 100, 3, 0, 0, 32810, 0, 'Griselda Hunderland'),
+(26043, 0, 2, 'Greetings.', 12, 0, 100, 3, 0, 0, 32935, 0, 'Griselda Hunderland'),
+(26043, 0, 3, 'Welcome!', 12, 0, 100, 3, 0, 0, 32807, 0, 'Griselda Hunderland'),
+(26043, 0, 4, 'Greetings! Please have a look around.', 12, 0, 100, 0, 0, 0, 32809, 0, 'Griselda Hunderland - Player In Range'),
+(26043, 0, 5, 'Welcome. May I help you find something?', 12, 0, 100, 0, 0, 0, 32811, 0, 'Griselda Hunderland - Player In Range'),
+(26043, 0, 6, 'Welcome.', 12, 0, 100, 0, 0, 0, 32936, 0, 'Griselda Hunderland - Player In Range');
+
+-- Endora Moorehead → Talker: 29636
+DELETE FROM `creature_text` WHERE (`CreatureID` = 29636);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(29636, 0, 0, 'Greetings! Please have a look around.', 12, 0, 100, 3, 0, 0, 32809, 0, 'Endora Moorehead'),
+(29636, 0, 1, 'Greetings, $c.', 12, 0, 100, 3, 0, 0, 32808, 0, 'Endora Moorehead'),
+(29636, 0, 2, 'Welcome!', 12, 0, 100, 3, 0, 0, 32807, 0, 'Endora Moorehead'),
+(29636, 0, 3, 'Let me know if you need help finding anything, $c.', 12, 0, 100, 0, 0, 0, 32810, 0, 'Endora Moorehead - Player In Range'),
+(29636, 0, 4, 'Welcome. May I help you find something?', 12, 0, 100, 0, 0, 0, 32811, 0, 'Endora Moorehead - Player In Range'),
+(29636, 0, 5, 'Greetings.', 12, 0, 100, 0, 0, 0, 32935, 0, 'Endora Moorehead - Player In Range'),
+(29636, 0, 6, 'Welcome.', 12, 0, 100, 0, 0, 0, 32936, 0, 'Endora Moorehead - Player In Range');
+
+-- Karandonna → Talker: 28995
+DELETE FROM `creature_text` WHERE (`CreatureID` = 28995);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(28995, 0, 0, 'Welcome. May I help you find something?', 12, 0, 100, 3, 0, 0, 32811, 0, 'Karandonna'),
+(28995, 0, 1, 'Welcome.', 12, 0, 100, 3, 0, 0, 32936, 0, 'Karandonna'),
+(28995, 0, 2, 'Welcome!', 12, 0, 100, 0, 0, 0, 32807, 0, 'Karandonna - Player In Range'),
+(28995, 0, 3, 'Greetings, $c.', 12, 0, 100, 0, 0, 0, 32808, 0, 'Karandonna - Player In Range'),
+(28995, 0, 4, 'Greetings! Please have a look around.', 12, 0, 100, 0, 0, 0, 32809, 0, 'Karandonna - Player In Range'),
+(28995, 0, 5, 'Let me know if you need help finding anything, $c.', 12, 0, 100, 0, 0, 0, 32810, 0, 'Karandonna - Player In Range'),
+(28995, 0, 6, 'Greetings.', 12, 0, 100, 0, 0, 0, 32935, 0, 'Karandonna - Player In Range');
+
+-- Miles Sidney → Talker: 28355
+DELETE FROM `creature_text` WHERE (`CreatureID` = 28355);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+-- GroupID 0 → Script 2834700 id=1 e Script 2834701 id=0
+(28355, 0, 0, 'I\'m working on it, I just don\'t want to sell it until I\'m happy with it. It shouldn\'t be long.', 12, 0, 100, 0, 0, 0, 27808, 0, 'Wright Williams'),
+-- GroupID 1 → Script 2834702 id=0
+(28355, 1, 0, 'Sir, our customers are complaining that there\'s not enough Maiden\'s Anguish in our Deadly Poisons.', 12, 0, 100, 0, 0, 0, 27803, 0, 'Wright Williams'),
+-- GroupID 2 → Script 2834700 id=1 e Script 2834702 id=0
+(28355, 2, 0, 'Sir, I think we were close with the Lethargy Root in that last poison recipe.', 12, 0, 100, 0, 0, 0, 27802, 0, 'Wright Williams'),
+-- GroupID 3 → Script 2834703 id=0
+(28355, 3, 0, 'Sir, our customers are complaining that there\'s too much Deathweed in our Anesthetics.', 12, 0, 100, 0, 0, 0, 27809, 0, 'Wright Williams'),
+(28355, 5, 0, 'Greetings.', 12, 7, 100, 3, 0, 0, 43337, 0, 'Miles Sidney'),
+(28355, 5, 1, 'Greetings, $c.', 12, 7, 100, 3, 0, 0, 43330, 0, 'Miles Sidney'),
+(28355, 5, 2, 'Greetings! Please have a look around.', 12, 7, 100, 3, 0, 0, 43333, 0, 'Miles Sidney'),
+(28355, 5, 3, 'Let me know if you need help finding anything, $c.', 12, 7, 100, 3, 0, 0, 43335, 0, 'Miles Sidney'),
+(28355, 5, 4, 'Welcome. May I help you find something?', 12, 7, 100, 3, 0, 0, 43336, 0, 'Miles Sidney');
diff --git a/data/sql/updates/db_world/2026_05_17_05.sql b/data/sql/updates/db_world/2026_05_17_05.sql
@@ -0,0 +1,8 @@
+-- DB update 2026_05_17_04 -> 2026_05_17_05
+--
+-- Scourgebane Infusion (item 22778 -> spell 28488) and Scourgebane Draught
+-- (item 22779 -> spell 28486) are not battle elixirs. Remove them from the
+-- Battle Elixir spell group(1) so they stack with each other and other
+-- flasks/elixirs.
+--
+DELETE FROM `spell_group` WHERE `id` = 1 AND `spell_id` IN (28486, 28488);
diff --git a/data/sql/updates/db_world/2026_05_17_06.sql b/data/sql/updates/db_world/2026_05_17_06.sql
@@ -0,0 +1,3 @@
+-- DB update 2026_05_17_05 -> 2026_05_17_06
+--
+UPDATE `item_loot_template` SET `Chance` = 0 WHERE `Entry` = 41888 AND `GroupId` = 1;
diff --git a/data/sql/updates/db_world/2026_05_17_07.sql b/data/sql/updates/db_world/2026_05_17_07.sql
@@ -0,0 +1,5 @@
+-- DB update 2026_05_17_06 -> 2026_05_17_07
+
+-- Remove Dead Alliance Soldier spawn point and creature addon
+DELETE FROM `creature` WHERE `id1` = 31281 AND `guid` = 121653;
+DELETE FROM `creature_addon` WHERE (`guid` IN (121653));
diff --git a/data/sql/updates/db_world/2026_05_18_00.sql b/data/sql/updates/db_world/2026_05_18_00.sql
@@ -0,0 +1,37 @@
+-- DB update 2026_05_17_07 -> 2026_05_18_00
+
+-- Set idle for Burning Blade Fanatics and Apprentices.
+UPDATE `creature` SET `wander_distance` = 0, `MovementType` = 0 WHERE (`id1` = 3198) AND (`guid` IN (6430, 6431));
+UPDATE `creature` SET `wander_distance` = 0, `MovementType` = 0 WHERE (`id1` = 3197) AND (`guid` IN (6427, 6429));
+
+-- Remove Old Waypoint from Creature Addon and set Movement Type to 0.
+UPDATE `creature` SET `MovementType` = 0 WHERE (`id1` = 3203) AND (`guid` IN (6455));
+UPDATE `creature_addon` SET `path_id` = 0 WHERE (`guid` IN (6455));
+
+-- Delete old Fizzle Darkstorm waypoint and add a sniffed new one.
+DELETE FROM `waypoint_data` WHERE (`id` IN (645500));
+INSERT INTO `waypoint_data` (`id`,  `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(645500, 1, 869.7513, -4202.463, -14.066155, NULL, 0, 0, 0, 100, 0),
+(645500, 2, 871.55255, -4210.9136, -12.093292, NULL, 0, 0, 0, 100, 0),
+(645500, 3, 876.02, -4217.9136, -11.525927, NULL, 25000, 0, 0, 100, 0),
+(645500, 4, 870.5361, -4208.033, -13.908268, NULL, 0, 0, 0, 100, 0),
+(645500, 5, 867.7095, -4194.5493, -14.389078, NULL, 0, 0, 0, 100, 0),
+(645500, 6, 868.6138, -4189.563, -14.07393, NULL, 45000, 0, 0, 100, 0);
+
+-- Set Fizzle Darkstorm SmartAI and update old comments.
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 3203;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 3203);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(3203, 0, 0, 0, 1, 0, 100, 1, 1000, 1000, 0, 0, 0, 0, 11, 11939, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - Out of Combat - Cast \'Summon Imp\' (No Repeat)'),
+(3203, 0, 1, 0, 0, 0, 100, 0, 0, 0, 2400, 3800, 0, 0, 11, 20791, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - In Combat - Cast \'Shadow Bolt\''),
+(3203, 0, 2, 0, 2, 0, 100, 0, 0, 50, 20000, 30000, 0, 0, 11, 7290, 1, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - Between 0-50% Health - Cast \'Soul Siphon\''),
+(3203, 0, 3, 0, 2, 0, 100, 1, 0, 15, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - Between 0-15% Health - Flee For Assist (No Repeat)'),
+(3203, 0, 4, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 232, 645500, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - On Reset - Start Path 645500'),
+(3203, 0, 5, 0, 108, 0, 100, 0, 3, 645500, 0, 0, 0, 0, 80, 320300, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - On Point 3 of Path 645500 Reached - Run Script');
+
+-- Add Action List.
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 320300);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(320300, 9, 0, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 0, 11, 21157, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - Actionlist - Cast \'Dark Channeling\''),
+(320300, 9, 1, 0, 0, 0, 100, 0, 25000, 25000, 0, 0, 0, 0, 28, 21157, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Fizzle Darkstorm - Actionlist - Remove Aura \'Dark Channeling\'');
diff --git a/data/sql/updates/db_world/2026_05_18_01.sql b/data/sql/updates/db_world/2026_05_18_01.sql
@@ -0,0 +1,28 @@
+-- DB update 2026_05_18_00 -> 2026_05_18_01
+
+-- Update 15066 spawntime (it must be instant), add two new spawn points and set random in radius.
+DELETE FROM `creature` WHERE (`id1` = 3467);
+INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES
+(15066, 3467, 0, 0, 1, 0, 0, 1, 1, 1, -1571.79, -3884.28, 16.2173, 3.83286, 1, 5, 0, 356, 0, 1, 0, 0, 0, '67511', 0, 0, NULL),
+(15215, 3467, 0, 0, 1, 0, 0, 1, 1, 1, -1748.25, -3721.78, 16.2173, 14.1181, 1, 5, 0, 356, 0, 1, 0, 0, 0, '67511', 0, 0, NULL),
+(15217, 3467, 0, 0, 1, 0, 0, 1, 1, 1, -1706.97, -3818.9, 13.1778, 4.88414, 1, 5, 0, 356, 0, 1, 0, 0, 0, '67511', 0, 0, NULL);
+
+-- Delete Baron Longshore Creature Addon
+DELETE FROM `creature_addon` WHERE (`guid` IN (15066));
+
+-- Set Baron Longshore template addon.
+DELETE FROM `creature_template_addon` WHERE (`entry` = 3467);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(3467, 0, 0, 0, 1, 0, 0, '');
+
+-- Set Baron Longshore Pool Template
+DELETE FROM `pool_template` WHERE (`entry` IN (144));
+INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
+(144, 1, 'Baron Longshore');
+
+-- Link Baron Longshore Spawn Points to Pool Entry.
+DELETE FROM `pool_creature` WHERE (`guid` IN (15066, 15215, 15217));
+INSERT INTO `pool_creature` (`guid`, `pool_entry`, `chance`, `description`) VALUES
+(15066, 144, 0, 'Baron Longshore 1'),
+(15215, 144, 0, 'Baron Longshore 2'),
+(15217, 144, 0, 'Baron Longshore 3');
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
@@ -681,6 +681,8 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_RESPAWN_GAMEOBJECT_GUID                = 917,
     RBAC_PERM_COMMAND_RESPAWN_CREATURE_ENTRY                 = 918,
     RBAC_PERM_COMMAND_RESPAWN_GAMEOBJECT_ENTRY               = 919,
+    RBAC_PERM_COMMAND_DEBUG_INFO                             = 920,
+    RBAC_PERM_COMMAND_DEBUG_COSMETIC                         = 921,
     // custom permissions 1000+
     RBAC_PERM_MAX
 };
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp
@@ -21,6 +21,7 @@
 
 #include "AreaDefines.h"
 #include "BattlefieldWG.h"
+#include "ScriptMgr.h"
 #include "Chat.h"
 #include "GameTime.h"
 #include "MapMgr.h"
@@ -722,16 +723,19 @@ void BattlefieldWG::HandleKill(Player* killer, Unit* victim)
     // xinef: tower cannons also grant rank
     if (victim->IsPlayer() || IsKeepNpc(victim->GetEntry()) || victim->GetEntry() == NPC_WINTERGRASP_TOWER_CANNON)
     {
-        if (victim->IsPlayer() && victim->HasAura(SPELL_LIEUTENANT))
+        if (Player* victimPlayer = victim->ToPlayer())
         {
-            // Quest - Wintergrasp - PvP Kill - Horde/Alliance
-            for (ObjectGuid const& playerGuid : PlayersInWar[killerTeam])
+            sScriptMgr->OnBattlefieldPlayerKill(this, killer, victimPlayer);
+
+            if (victimPlayer->HasAura(SPELL_LIEUTENANT))
             {
-                if (Player* player = ObjectAccessor::FindPlayer(playerGuid))
+                // Quest - Wintergrasp - PvP Kill - Horde/Alliance
+                for (ObjectGuid const& playerGuid : PlayersInWar[killerTeam])
                 {
-                    if (player->GetDistance2d(killer) < 40)
+                    if (Player* player = ObjectAccessor::FindPlayer(playerGuid))
                     {
-                        player->KilledMonsterCredit(killerTeam == TEAM_HORDE ? NPC_QUEST_PVP_KILL_ALLIANCE : NPC_QUEST_PVP_KILL_HORDE);
+                        if (player->GetDistance2d(killer) < 40)
+                            player->KilledMonsterCredit(killerTeam == TEAM_HORDE ? NPC_QUEST_PVP_KILL_ALLIANCE : NPC_QUEST_PVP_KILL_HORDE);
                     }
                 }
             }
diff --git a/src/server/game/Entities/Player/PlayerQuest.cpp b/src/server/game/Entities/Player/PlayerQuest.cpp
@@ -422,6 +422,7 @@ bool Player::CanRewardQuest(Quest const* quest, bool msg)
 void Player::AddQuestAndCheckCompletion(Quest const* quest, Object* questGiver)
 {
     AddQuest(quest, questGiver);
+    sScriptMgr->OnPlayerQuestAccept(this, quest);
 
     if (CanCompleteQuest(quest->GetQuestId()))
         CompleteQuest(quest->GetQuestId());
diff --git a/src/server/game/Entities/Vehicle/Vehicle.cpp b/src/server/game/Entities/Vehicle/Vehicle.cpp
@@ -506,6 +506,9 @@ void Vehicle::RemovePassenger(Unit* unit)
 
     seat->second.Passenger.Reset();
 
+    // RemoveCharmedBy() clears MOVEMENTFLAG_FLYING, so cache this before uncharm.
+    bool wasFlying = _me->IsFlying();
+
     if (_me->IsCreature() && unit->IsPlayer() && seat->second.SeatInfo->m_flags & VEHICLE_SEAT_FLAG_CAN_CONTROL)
         _me->RemoveCharmedBy(unit);
 
@@ -521,7 +524,7 @@ void Vehicle::RemovePassenger(Unit* unit)
     }
 
     // only for flyable vehicles
-    if (_me->IsFlying() && !_me->GetInstanceId() && unit->IsPlayer() && !(unit->ToPlayer()->GetDelayedOperations() & DELAYED_VEHICLE_TELEPORT) && _me->GetEntry() != 30275 /*NPC_WILD_WYRM*/)
+    if (wasFlying && !_me->GetInstanceId() && unit->IsPlayer() && !(unit->ToPlayer()->GetDelayedOperations() & DELAYED_VEHICLE_TELEPORT) && _me->GetEntry() != 30275 /*NPC_WILD_WYRM*/)
         _me->CastSpell(unit, VEHICLE_SPELL_PARACHUTE, true);
 
     if (_me->IsCreature())
diff --git a/src/server/game/Scripting/ScriptDefines/BattlefieldScript.cpp b/src/server/game/Scripting/ScriptDefines/BattlefieldScript.cpp
@@ -49,6 +49,11 @@ void ScriptMgr::OnBattlefieldWarEnd(Battlefield* bf, bool endByTimer)
     CALL_ENABLED_HOOKS(BattlefieldScript, BATTLEFIELDHOOK_ON_WAR_END, script->OnBattlefieldWarEnd(bf, endByTimer));
 }
 
+void ScriptMgr::OnBattlefieldPlayerKill(Battlefield* bf, Player* killer, Player* victim)
+{
+    CALL_ENABLED_HOOKS(BattlefieldScript, BATTLEFIELDHOOK_ON_PLAYER_KILL, script->OnBattlefieldPlayerKill(bf, killer, victim));
+}
+
 BattlefieldScript::BattlefieldScript(char const* name, std::vector<uint16> enabledHooks) :
     ScriptObject(name, BATTLEFIELDHOOK_END)
 {
diff --git a/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h b/src/server/game/Scripting/ScriptDefines/BattlefieldScript.h
diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp
diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.h b/src/server/game/Scripting/ScriptDefines/PlayerScript.h
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp
diff --git a/src/server/scripts/Commands/cs_debug.cpp b/src/server/scripts/Commands/cs_debug.cpp
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
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+-- DB update 2026_05_17_01 -> 2026_05_17_02`
	`2`	+UPDATE `smart_scripts` SET `action_param6` = 2 WHERE `entryorguid` IN (17809, 17810, 17811, 17812) AND `source_type` = 0 AND `action_type` = 53;
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-- DB update 2026_05_17_05 -> 2026_05_17_06`
	`2`	`+--`
	`3`	+UPDATE `item_loot_template` SET `Chance` = 0 WHERE `Entry` = 41888 AND `GroupId` = 1;