Merge 3.3.5-base_patch to 3.3.5-tele_npc_3

Author: Github Actions

sql/updates/world/3.3.5/2025_07_08_00_world.sql

@@ -0,0 +1,10 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 19218 AND `GroupID` = 4;
+DELETE FROM `creature_text` WHERE `CreatureID` = 19710 AND `GroupID` = 5;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(19218,4,0,"You hear a faint unlocking sound...",16,0,100,0,0,0,19055,0,"Gatewatcher Gyro-Kill - On Death"),
+(19710,5,0,"You hear a faint unlocking sound...",16,0,100,0,0,0,19055,0,"Gatewatcher Iron-Hand - On Death");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 35301;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,35301,0,0,31,0,3,21062,0,0,0,0,"","Group 0: Spell 'Suicide' (Effect 0) targets creature 'Nether Wraith'");

sql/updates/world/3.3.5/2025_07_08_01_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_dalliah_the_doomsayer_whirlwind';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(36142, 'spell_dalliah_the_doomsayer_whirlwind');

sql/updates/world/3.3.5/2025_07_12_00_world.sql

@@ -0,0 +1,22 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 17380;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17380,0,0,"Kill them!",14,0,100,0,0,0,15115,0,"broggok SAY_INTRO"),
+(17380,1,0,"Come intruders....",14,0,100,0,0,0,14259,0,"broggok SAY_AGGRO");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 26838;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,26838,0,0,31,0,3,16006,0,0,0,0,"","Group 0: Spell 'Despawn InCombat Trigger' (Effect 0) targets creature 'InCombat Trigger'");
+
+DELETE FROM `spell_script_names` WHERE `spell_id` = 26838 AND `ScriptName` = 'spell_gen_despawn_target';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(26838,'spell_gen_despawn_target');
+-- Credit - Cmangos
+DELETE FROM `waypoint_data` WHERE `id` = 1381150;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(1381150,1,455.6496,33.33417,9.544375,NULL,0,1,0,100,0),
+(1381150,2,456.105,44.3159,9.62544,NULL,0,1,0,100,0),
+(1381150,3,458.401,50.6364,9.62375,NULL,0,1,0,100,0),
+(1381150,4,461.782,54.9224,9.6233,NULL,0,1,0,100,0),
+(1381150,5,463.657,60.3144,9.61813,NULL,0,1,0,100,0),
+(1381150,6,456.328,78.3051,9.61487,1.53589,0,1,0,100,0);

sql/updates/world/3.3.5/2025_07_12_01_world.sql

@@ -0,0 +1,126 @@
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_sholazar_deathbolt' WHERE `ScriptName` = 'spell_q12611_deathbolt';
+
+--
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 28563;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (28563) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2856300) AND `source_type` = 9;
+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`, `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
+(28563,0,0,0,38,0,100,0,1,1,0,0,0,80,2856300,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Data Set 1 1 - Run Action List"),
+-- We don't have invoker here
+-- For some reason it doesn't work no matter how it is used
+-- (2856300,9,0,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Say Line 0"),
+(2856300,9,1,0,0,0,100,0,0,0,0,0,0,11,51318,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Freya Dummy'"),
+(2856300,9,2,0,0,0,100,0,5000,5000,0,0,0,11,51395,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Lifeforce'"),
+(2856300,9,3,0,0,0,100,0,5000,5000,0,0,0,11,51395,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Lifeforce'"),
+(2856300,9,4,0,0,0,100,0,5000,5000,0,0,0,11,51395,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Lifeforce'"),
+(2856300,9,5,0,0,0,100,0,5000,5000,0,0,0,11,51395,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Lifeforce'"),
+(2856300,9,6,0,0,0,100,0,5000,5000,0,0,0,11,51395,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Freya's Presence - On Script - Cast 'Lifeforce'");
+
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_sholazar_call_of_the_lifewarden' WHERE `ScriptName` = 'spell_q12620_the_lifewarden_wrath';
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_sholazar_freya_dummy';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(51318, 'spell_sholazar_freya_dummy');
+
+UPDATE `creature_text` SET `Probability` = 100 WHERE `CreatureID` = 28563;
+
+--
+UPDATE `spell_script_names` SET `ScriptName` = 'spell_sholazar_shoot_rjr' WHERE `ScriptName` = 'spell_q12589_shoot_rjr';
+
+--
+UPDATE `creature_text` SET `ID` = 0 WHERE `CreatureID` = 28787;
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 28787;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (28787) AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2878700,2878701,2878702,2878703,2878704) AND `source_type` = 9;
+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`, `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
+(28787,0,0,0,19,0,100,0,12688,0,0,0,0,80,2878700,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Quest 'Engineering a Disaster' Taken - Run Script"),
+
+(2878700,9,0,0,0,0,100,0,0,0,0,0,0,64,1,0,0,0,0,0,16,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Store Targetlist"),
+(2878700,9,1,0,0,0,100,0,0,0,0,0,0,2,113,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Set Faction 113"),
+(2878700,9,2,0,0,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Remove NPC Flag Questgiver"),
+(2878700,9,3,0,0,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 0"),
+(2878700,9,4,0,0,0,100,0,3000,3000,0,0,0,53,0,2878700,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Start Waypoint"),
+
+(28787,0,1,0,58,0,100,0,0,2878700,0,0,0,80,2878701,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Waypoint Finished - Run Script"),
+
+(2878701,9,0,0,0,0,100,0,0,0,0,0,0,1,1,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 1"),
+(2878701,9,1,0,0,0,100,0,4000,4000,0,0,0,1,2,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 2"),
+(2878701,9,2,0,0,0,100,0,1000,1000,0,0,0,11,52369,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Cast 'Detonate Explosives'"),
+(2878701,9,3,0,0,0,100,0,2000,2000,0,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 3"),
+(2878701,9,4,0,0,0,100,0,3000,3000,0,0,0,53,0,2878701,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Start Waypoint"),
+
+(28787,0,2,0,58,0,100,0,0,2878701,0,0,0,80,2878702,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Waypoint Finished - Run Script"),
+
+(2878702,9,0,0,0,0,100,0,0,0,0,0,0,1,4,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 4"),
+(2878702,9,1,0,0,0,100,0,3000,3000,0,0,0,1,5,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 5"),
+(2878702,9,2,0,0,0,100,0,1000,1000,0,0,0,11,52371,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Cast 'Detonate Explosives'"),
+(2878702,9,3,0,0,0,100,0,2000,2000,0,0,0,53,0,2878702,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Start Waypoint"),
+
+(28787,0,3,0,58,0,100,0,0,2878702,0,0,0,80,2878703,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Waypoint Finished - Run Script"),
+
+(2878703,9,0,0,0,0,100,0,0,0,0,0,0,1,6,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Say Line 6"),
+(2878703,9,1,0,0,0,100,0,0,0,0,0,0,145,1,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Set ImmuneNPC"),
+(2878703,9,2,0,0,0,100,0,0,0,0,0,0,15,12688,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Script - Quest Credit 'Engineering a Disaster'"),
+(2878703,9,3,0,0,0,100,0,5000,5000,0,0,0,53,1,2878703,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Start Waypoint"),
+
+(28787,0,4,0,58,0,100,0,0,2878703,0,0,0,80,2878704,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Waypoint Finished - Run Script"),
+
+(2878704,9,0,0,0,0,100,0,0,0,0,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Engineer Helice - On Script - Despawn Instant"),
+
+(28787,0,5,0,6,0,100,0,0,0,0,0,0,6,12688,0,0,0,0,0,12,1,0,0,0,0,0,0,0,"Engineer Helice - On Death - Fail Quest 'Engineering a Disaster'");
+
+DELETE FROM `script_waypoint` WHERE `entry` = 28787;
+DELETE FROM `waypoints` WHERE `entry` BETWEEN 2878700 AND 2878703;
+INSERT INTO `waypoints` (`entry`,`pointid`,`position_x`,`position_y`,`position_z`,`point_comment`) VALUES
+(2878700,1,5916.655,5377.119,-98.89189,"Engineer Helice"),
+(2878700,2,5918.303,5375.1846,-98.880905,"Engineer Helice"),
+
+(2878701,1,5925.6353,5371.7607,-98.87892,"Engineer Helice"),
+(2878701,2,5928.4595,5377.634,-99.029175,"Engineer Helice"),
+(2878701,3,5923.454,5380.128,-102.07381,"Engineer Helice"),
+(2878701,4,5917.1875,5382.8125,-106.24332,"Engineer Helice"),
+(2878701,5,5910.8545,5386.836,-106.24332,"Engineer Helice"),
+(2878701,6,5905.1245,5393.084,-104.36307,"Engineer Helice"),
+(2878701,7,5904.211,5399.0137,-99.61832,"Engineer Helice"),
+(2878701,8,5903.869,5404.004,-97.14992,"Engineer Helice"),
+(2878701,9,5899.6494,5408.9204,-95.80813,"Engineer Helice"),
+(2878701,10,5894.604,5406.4204,-95.773094,"Engineer Helice"),
+(2878701,11,5890.022,5398.5986,-95.45413,"Engineer Helice"),
+(2878701,12,5888.2026,5389.766,-95.39017,"Engineer Helice"),
+(2878701,13,5887.8447,5385.628,-95.3472,"Engineer Helice"),
+
+(2878702,1,5879.204,5379.8057,-94.22403,"Engineer Helice"),
+(2878702,2,5874.893,5370.3823,-95.97647,"Engineer Helice"),
+(2878702,3,5872.0894,5363.6025,-97.509,"Engineer Helice"),
+(2878702,4,5865.1177,5357.971,-98.60394,"Engineer Helice"),
+(2878702,5,5857.0767,5352.808,-98.93683,"Engineer Helice"),
+(2878702,6,5849.1987,5344.5957,-99.35419,"Engineer Helice"),
+(2878702,7,5841.1,5335.7026,-100.4754,"Engineer Helice"),
+(2878702,8,5834.303,5326.5703,-99.19456,"Engineer Helice"),
+(2878702,9,5826.3457,5317.33,-97.85027,"Engineer Helice"),
+(2878702,10,5818.2407,5305.194,-97.43694,"Engineer Helice"),
+
+(2878703,1,5801.7915,5296.6514,-95.75294,"Engineer Helice"),
+(2878703,2,5791.565,5298.5063,-96.164955,"Engineer Helice"),
+(2878703,3,5775.99,5302.8086,-98.47748,"Engineer Helice"),
+(2878703,4,5758.465,5306.957,-97.36847,"Engineer Helice");
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 28789;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 28789 AND `source_type` = 0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2878900,2878901) AND `source_type` = 9;
+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`,`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
+(28789,0,0,0,8,0,100,0,52369,0,0,0,0,80,2878900,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Spellhit 'Detonate Explosives' - Run Script"),
+
+(2878900,9,0,0,0,0,100,0,0,0,0,0,0,11,46419,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Cast 'Cosmetic - Explosion'"),
+(2878900,9,1,0,0,0,100,0,0,0,0,0,0,131,67,0,0,4,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Spawn SpawnGroup 67"),
+(2878900,9,2,0,0,0,100,0,20000,20000,0,0,0,132,67,0,0,4,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Despawn SpawnGroup 67"),
+
+(28789,0,1,0,8,0,100,0,52371,0,0,0,0,80,2878901,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Spellhit 'Detonate Explosives' - Run Script"),
+
+(2878901,9,0,0,0,0,100,0,0,0,0,0,0,11,46419,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Cast 'Cosmetic - Explosion'"),
+(2878901,9,1,0,0,0,100,0,0,0,0,0,0,131,68,0,0,4,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Spawn SpawnGroup 68"),
+(2878901,9,2,0,0,0,100,0,20000,20000,0,0,0,132,68,0,0,4,0,0,1,0,0,0,0,0,0,0,0,"Explosion Guy - On Script - Despawn SpawnGroup 68");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_q12688_detonate_1','spell_q12688_detonate_2');

sql/updates/world/3.3.5/2025_07_12_02_world.sql

@@ -0,0 +1,6 @@
+--
+UPDATE `creature_template` SET `ScriptName` = 'boss_celebras_the_cursed' WHERE `entry` = 12225;
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_noxxion_summon_spawns';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(21708, 'spell_noxxion_summon_spawns');

sql/updates/world/3.3.5/2025_07_13_00_world.sql

@@ -15,17 +15,13 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef AsyncCallbackProcessor_h__
-#define AsyncCallbackProcessor_h__
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H
 
-#include "Define.h"
-#include <algorithm>
+#include "AsyncCallbackProcessorFwd.h"
 #include <vector>
 
-//template <class T>
-//concept AsyncCallback = requires(T t) { { t.InvokeIfReady() } -> std::convertible_to<bool> };
-
-template<typename T> // requires AsyncCallback<T>
+template<AsyncCallback T>
 class AsyncCallbackProcessor
 {
 public:
@@ -34,8 +30,7 @@ class AsyncCallbackProcessor
 
     T& AddCallback(T&& query)
     {
-        _callbacks.emplace_back(std::move(query));
-        return _callbacks.back();
+        return _callbacks.emplace_back(std::move(query));
     }
 
     void ProcessReadyCallbacks()
@@ -45,19 +40,29 @@ class AsyncCallbackProcessor
 
         std::vector<T> updateCallbacks{ std::move(_callbacks) };
 
-        updateCallbacks.erase(std::remove_if(updateCallbacks.begin(), updateCallbacks.end(), [](T& callback)
+        std::erase_if(updateCallbacks, [](T& callback)
         {
-            return callback.InvokeIfReady();
-        }), updateCallbacks.end());
+            return InvokeAsyncCallbackIfReady(callback);
+        });
 
         _callbacks.insert(_callbacks.end(), std::make_move_iterator(updateCallbacks.begin()), std::make_move_iterator(updateCallbacks.end()));
     }
 
+    bool Empty() const
+    {
+        return _callbacks.empty();
+    }
+
+    void CancelAll()
+    {
+        _callbacks.clear();
+    }
+
 private:
     AsyncCallbackProcessor(AsyncCallbackProcessor const&) = delete;
     AsyncCallbackProcessor& operator=(AsyncCallbackProcessor const&) = delete;
 
     std::vector<T> _callbacks;
 };
 
-#endif // AsyncCallbackProcessor_h__
+#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_H

src/common/Utilities/AsyncCallbackProcessor.h

@@ -0,0 +1,29 @@
+/*
+ * This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+#define TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H
+
+#include <concepts>
+
+template <typename T>
+concept AsyncCallback = requires(T& t) { { InvokeAsyncCallbackIfReady(t) } -> std::convertible_to<bool>; };
+
+template<AsyncCallback T>
+class AsyncCallbackProcessor;
+
+#endif // TRINITYCORE_ASYNC_CALLBACK_PROCESSOR_FWD_H