Merge branch '3.3.5' of https://github.com/TrinityCore/TrinityCore

# Conflicts:
#	src/server/game/Battlegrounds/Battleground.cpp
#	src/server/game/Entities/Object/Object.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Maps/MapInstanced.cpp
#	src/server/game/Maps/MapManager.cpp

cmake/compiler/msvc/settings.cmake

@@ -111,6 +111,12 @@ message(STATUS "MSVC: Disabled NON-SECURE warnings")
 target_compile_definitions(trinity-compile-option-interface
   INTERFACE
     -D_CRT_NONSTDC_NO_WARNINGS)
+
+# Force math constants like M_PI to be available
+target_compile_definitions(trinity-compile-option-interface
+  INTERFACE
+    -D_USE_MATH_DEFINES)
+
 message(STATUS "MSVC: Disabled POSIX warnings")
 
 # Ignore specific warnings

sql/updates/world/3.3.5/2024_03_13_00_world.sql

@@ -0,0 +1,3 @@
+DELETE FROM skill_fishing_base_level WHERE entry=4415;
+INSERT INTO skill_fishing_base_level (entry, skill)
+VALUES (4415, 550)

sql/updates/world/3.3.5/2024_03_14_00_world.sql

@@ -0,0 +1,18 @@
+-- Cast aura 70193 on player if one of the following conditions are meet
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 17 AND `SourceGroup` = 0 AND `SourceEntry` = 70193;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 70193, 0, 1, 8, 0, 24480, 0, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest The Halls Of Reflection (A) rewarded"),
+(17, 0, 70193, 0, 2, 47, 0, 24522, 74, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest Journey To The Sunwell (A) progress | completed | rewarded"),
+(17, 0, 70193, 0, 3, 47, 0, 24535, 74, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest Thalorien Dawnseeker (A) progress | completed | rewarded"),
+(17, 0, 70193, 0, 4, 8, 0, 24561, 0, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest The Halls Of Reflection (H) rewarded"),
+(17, 0, 70193, 0, 5, 47, 0, 24562, 74, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest Journey To The Sunwell (H) progress | completed | rewarded"),
+(17, 0, 70193, 0, 6, 47, 0, 24563, 74, 0, 0, 0, 0, '', "Cast aura 70193 on player only if quest Thalorien Dawnseeker (H) progress | completed | rewarded");
+
+--
+DELETE FROM `spell_area` WHERE `spell`=70193 AND `quest_start` IN (24535,24563);
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(70193, 4092, 24535, 24535, 0, 0, 2, 1, 75, 75),
+(70193, 4092, 24563, 24563, 0, 0, 2, 1, 75, 75);
+
+--
+UPDATE `spell_area` SET `quest_start_status`=75,`quest_end_status`=75 WHERE `spell`=70193 AND `area`=4094;

sql/updates/world/3.3.5/2024_03_14_01_world.sql

@@ -0,0 +1,23 @@
+-- Update Kialon Nightblade
+UPDATE `creature_template_addon` SET `PvPFlags`=1 WHERE `entry`=18098;
+UPDATE `creature_template` SET `speed_walk`=1 WHERE `entry`=18098;
+
+-- Waypoints
+SET @PATH=64051 * 10;
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(@PATH, 0, 1955.909, 6887.554, 162.2125, NULL, 0, 0, 0, 100, 0),
+(@PATH, 1, 1957.126, 6870.499, 161.0544, NULL, 0, 0, 0, 100, 0),
+(@PATH, 2, 1963.431, 6862.901, 160.0951, NULL, 0, 0, 0, 100, 0),
+(@PATH, 3, 1972.715, 6859.702, 162.0977, NULL, 60000, 0, 0, 100, 0),
+(@PATH, 4, 1964.917, 6866.565, 160.7522, NULL, 0, 0, 0, 100, 0),
+(@PATH, 5, 1956.629, 6881.325, 161.8812, NULL, 0, 0, 0, 100, 0),
+(@PATH, 6, 1955.969, 6887.533, 162.1539, NULL, 0, 0, 0, 100, 0),
+(@PATH, 7, 1957.679, 6894.385, 161.872, NULL, 300000, 0, 0, 100, 0);
+
+-- SAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 18098;
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryorguid` = 18098;
+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
+(18098, 0, 0, 0, 40, 0, 100, 0, 3, 640510, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "Kialon Nightblade - On Waypoint 3 reached - Say Line 0"),
+(18098, 0, 1, 0, 40, 0, 100, 0, 7, 640510, 0, 0, 0, 66, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 4.45059,  "Kialon Nightblade - On Waypoint 7 reached - Set Orientation");

sql/updates/world/3.3.5/2024_03_14_02_world.sql

@@ -0,0 +1,7 @@
+-- Update wrong translation for 'Scroll of enchant shield: defense'
+UPDATE `item_template_locale` SET `Name`='Pergamino de Encantar escudo: defensa' WHERE `ID`=38954 AND `locale` IN ('esES','esMX');
+-- Add missing locale for 'Scroll of enchant shield: greater intellect'
+DELETE FROM `item_template_locale` WHERE `ID`=44455 AND `locale` IN ('esES','esMX');
+INSERT INTO `item_template_locale` (`ID`, `locale`, `Name`, `Description`, `VerifiedBuild`) VALUES
+(44455, 'esES', 'Pergamino de Encantar escudo: intelecto superior', '', -12340),
+(44455, 'esMX', 'Pergamino de Encantar escudo: intelecto superior', '', -12340);

sql/updates/world/3.3.5/2024_03_14_03_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `trinity_string` WHERE `entry`=1517;
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES
+(1517, 'Quest ID %u does not exist.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);

src/common/Collision/BoundingIntervalHierarchy.h

@@ -70,6 +70,7 @@ class TC_COMMON_API BIH
         {
             tree.clear();
             objects.clear();
+            bounds = G3D::AABox::empty();
             // create space for the first node
             tree.push_back(3u << 30u); // dummy leaf
             tree.insert(tree.end(), 2, 0);

src/common/Define.h

@@ -56,7 +56,6 @@
 
 #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
 #  define TRINITY_PATH_MAX 260
-#  define _USE_MATH_DEFINES
 #else // TRINITY_PLATFORM != TRINITY_PLATFORM_WINDOWS
 #  define TRINITY_PATH_MAX PATH_MAX
 #endif // TRINITY_PLATFORM