Merge 3.3.5 to 3.3.5-solocraft

Author: Github Actions

cmake/compiler/clang/settings.cmake

@@ -58,9 +58,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -g3 -glldb)
 
-  message(STATUS "Clang: Debug-flags set (-g3)")
+  message(STATUS "Clang: Debug-flags set (-g3 -glldb)")
 endif()
 
 if(ASAN)

cmake/compiler/gcc/settings.cmake

@@ -44,9 +44,9 @@ endif()
 if(WITH_COREDEBUG)
   target_compile_options(trinity-compile-option-interface
     INTERFACE
-      -g3)
+      -ggdb3)
 
-  message(STATUS "GCC: Debug-flags set (-g3)")
+  message(STATUS "GCC: Debug-flags set (-ggdb3)")
 endif()
 
 if(ASAN)

sql/updates/world/3.3.5/2026_04_11_00_world.sql

@@ -0,0 +1,53 @@
+-- Morogrim
+UPDATE `creature_template` SET `speed_run` = 2.14286, `BaseAttackTime` = 1600 WHERE `entry` = 21213;
+UPDATE `creature_model_info` SET `BoundingRadius` = 6.315, `CombatReach` = 6 WHERE `DisplayID` = 20739;
+
+UPDATE `creature_text` SET `Type` = 41 WHERE `CreatureID` = 21213 AND `GroupID` IN (5,7);
+
+UPDATE `creature` SET `position_x` = 370.829, `position_y` = -723.939, `position_z` = -14.005, `orientation` = 2.93215 WHERE `id` = 21213;
+
+-- Murlocs
+DELETE FROM `spell_target_position` WHERE `ID` IN (37766,37923,37925,37926,37927,39813,39814,39815,39816,39817,37772,37928,37929,37931,37932,39818,39819,39820,39821,39822);
+INSERT INTO `spell_target_position` (`ID`, `EffectIndex`, `MapID`, `PositionX`, `PositionY`, `PositionZ`, `Orientation`, `VerifiedBuild`) VALUES
+(37766,0,548,266,-707,-2.91667,5.34071,0),
+(37925,0,548,260,-712,-2.91667,5.34071,0),
+(37927,0,548,254,-719,-2.91667,5.34071,0),
+(39814,0,548,260,-704,-2.91667,5.11381,0),
+(39816,0,548,253,-707,-2.91667,5.2709,0),
+(39817,0,548,250,-708,-2.91667,5.14872,0),
+
+(37928,0,548,528,-699,-6.91667,3.9968,0),
+(37931,0,548,534,-706,-6.91667,3.9968,0),
+(39818,0,548,540,-700,-6.91667,4.32842,0),
+(39820,0,548,535,-695,-6.91667,4.01426,0),
+(39821,0,548,533,-691,-6.91667,4.31096,0),
+(39822,0,548,529,-691,-6.91667,4.31096,0);
+
+UPDATE `creature_template` SET `speed_walk` = 1.6, `speed_run` = 1.42857 WHERE `entry` = 21920;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 21920 AND `source_type` = 0;
+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
+(21920,0,0,0,37,0,100,0,0,0,0,0,0,116,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Tidewalker Lurker - On AI Initialize - Set Corpse Delay"),
+(21920,0,1,0,0,0,100,0,5000,10000,5000,10000,0,11,41932,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Tidewalker Lurker - In Combat - Cast 'Carnivorous Bite'");
+
+-- Watery Grave (first is sniffed, other copied from Water Globule spells)
+UPDATE `spell_target_position` SET `PositionX` = 334, `PositionY` = -728, `PositionZ` = -14, `Orientation` = 0, `VerifiedBuild` = 26365 WHERE `ID` = 37850;
+UPDATE `spell_target_position` SET `PositionX` = 366, `PositionY` = -736, `PositionZ` = -14, `Orientation` = 2.513274 WHERE `ID` = 38023;
+UPDATE `spell_target_position` SET `PositionX` = 366, `PositionY` = -709, `PositionZ` = -14, `Orientation` = 2.513274 WHERE `ID` = 38024;
+UPDATE `spell_target_position` SET `PositionX` = 372, `PositionY` = -690, `PositionZ` = -14, `Orientation` = 4.258604 WHERE `ID` = 38025;
+
+-- Water Globule
+UPDATE `spell_target_position` SET `PositionX` = 334, `PositionY` = -728, `PositionZ` = -14, `Orientation` = 0, `VerifiedBuild` = 26365 WHERE `ID` = 37854;
+UPDATE `spell_target_position` SET `PositionX` = 366, `PositionY` = -736, `PositionZ` = -14, `Orientation` = 2.513274, `VerifiedBuild` = 26365 WHERE `ID` = 37858;
+UPDATE `spell_target_position` SET `PositionX` = 366, `PositionY` = -709, `PositionZ` = -14, `Orientation` = 2.513274, `VerifiedBuild` = 26365 WHERE `ID` = 37860;
+UPDATE `spell_target_position` SET `PositionX` = 372, `PositionY` = -690, `PositionZ` = -14, `Orientation` = 4.258604, `VerifiedBuild` = 26365 WHERE `ID` = 37861;
+
+UPDATE `creature_template` SET `speed_walk` = 0.4, `speed_run` = 0.285714 WHERE `entry` = 21913;
+
+-- Spell scripts
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_morogrim_tidewalker_watery_grave',
+'spell_morogrim_tidewalker_summon_water_globules');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(38028, 'spell_morogrim_tidewalker_watery_grave'),
+(37866, 'spell_morogrim_tidewalker_summon_water_globules');

sql/updates/world/3.3.5/2026_04_12_00_world.sql

@@ -0,0 +1,19 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` = 17308;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17308,0,0,"Achor she-ki!  Feast, my pet!  Eat your fill!",14,0,100,0,0,10277,17637,0,"omor SAY_SUMMON"),
+(17308,1,0,"A-kreesh!",14,0,100,0,0,10278,17636,0,"omor SAY_KNOCK"),
+(17308,2,0,"I will not be defeated!",14,0,100,0,0,10279,17633,0,"omor SAY_AGGRO_1"),
+(17308,2,1,"You dare stand against ME?",14,0,100,0,0,10280,17634,0,"omor SAY_AGGRO_2"),
+(17308,2,2,"Your insolence will be your death!",14,0,100,0,0,10281,17635,0,"omor SAY_AGGRO_3"),
+(17308,3,0,"Die, weakling!",14,0,100,0,0,10282,17631,0,"omor SAY_SLAY_1"),
+(17308,3,1,"I am victorious!",14,0,100,0,0,10283,17632,0,"omor SAY_SLAY_2"),
+(17308,4,0,"It is... not over.",14,0,100,0,0,10284,17630,0,"omor SAY_DEATH"),
+(17308,5,0,"%s grins malevolently.",16,0,100,0,0,0,14756,0,"omor EMOTE_SHIELD");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_omor_the_unscarred_orbital_strike_target',
+'spell_omor_the_unscarred_orbital_strike_whip');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(35642, 'spell_omor_the_unscarred_orbital_strike_target'),
+(32185, 'spell_omor_the_unscarred_orbital_strike_whip');

src/server/authserver/authserver.conf.dist

@@ -36,7 +36,7 @@
 #    LogsDir
 #        Description: Logs directory setting.
 #        Important:   LogsDir needs to be quoted, as the string might contain space characters.
-#                     Logs directory must exists, or log file creation will be disabled.
+#                     Logs directory must exist, or log file creation will be disabled.
 #        Default:     "" - (Log files will be stored in the current path)
 
 LogsDir = ""
@@ -84,7 +84,8 @@ UseProcessors = 0
 #
 #    ProcessPriority
 #        Description: Process priority setting for Windows and Linux based systems.
-#        Details:     On Linux, a nice value of -15 is used. (requires superuser). On Windows, process is set to HIGH class.
+#        Details:     On Linux, a nice value of -15 is used (requires superuser).
+#                     On Windows, process is set to HIGH class.
 #        Default:     0 - (Normal)
 #                     1 - (High)
 
@@ -160,7 +161,7 @@ SourceDirectory  = ""
 #    MySQLExecutable
 #        Description: The path to your MySQL CLI binary.
 #                     If the path is left empty, built-in path from cmake is used.
-#        Example:     "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe"
+#        Example:     "C:/Program Files/MySQL/MySQL Server 8.0/bin/mysql.exe"
 #                     "mysql.exe"
 #                     "/usr/bin/mysql"
 #        Default:     ""
@@ -208,7 +209,7 @@ LoginDatabaseInfo = "127.0.0.1;3306;trinity;trinity;auth"
 
 #
 #    LoginDatabase.WorkerThreads
-#        Description: The amount of worker threads spawned to handle asynchronous (delayed) MySQL
+#        Description: The number of worker threads spawned to handle asynchronous (delayed) MySQL
 #                     statements. Each worker thread is mirrored with its own connection to the
 #                     MySQL server and their own thread on the MySQL server.
 #        Default:     1
@@ -217,7 +218,7 @@ LoginDatabase.WorkerThreads = 1
 
 #
 #    LoginDatabase.SynchThreads
-#        Description: The amount of MySQL connections spawned to handle.
+#        Description: The number of MySQL connections spawned to handle.
 #        Default:     1 - (LoginDatabase.WorkerThreads)
 
 LoginDatabase.SynchThreads  = 1
@@ -293,7 +294,7 @@ Updates.AllowRehash = 1
 
 #
 #    Updates.CleanDeadRefMaxCount
-#        Description: Cleans dead/ orphaned references that occur if an update was removed or renamed and edited in one step.
+#        Description: Cleans dead/orphaned references that occur if an update was removed or renamed and edited in one step.
 #                     It only starts the clean up if the count of the missing updates is below or equal the Updates.CleanDeadRefMaxCount value.
 #                     This way prevents erasing of the update history due to wrong source directory state (maybe wrong branch or bad revision).
 #                     Disable this if you want to know if the database is in a possible "dirty state".

src/server/game/AI/CoreAI/PetAI.cpp

@@ -363,7 +363,7 @@ void PetAI::HandleReturnMovement()
 
     // Prevent activating movement when under control of spells
     // such as "Eyes of the Beast"
-    if (me->IsCharmed())
+    if (me->isPossessed())
         return;
 
     if (!me->GetCharmInfo())

src/server/game/Entities/Unit/Unit.cpp

@@ -11582,6 +11582,7 @@ bool Unit::SetCharmedBy(Unit* charmer, CharmType type, AuraApplication const* au
 
     // Set charmed
     charmer->SetCharm(this, true);
+    m_combatManager.RevalidateCombat();
 
     if (Player* player = ToPlayer())
     {

src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp

@@ -73,7 +73,7 @@ void HomeMovementGenerator<Creature>::SetTargetLocation(Creature* owner)
      */
 
     owner->UpdateAllowedPositionZ(destination.m_positionX, destination.m_positionY, destination.m_positionZ);
-    init.MoveTo(PositionToVector3(destination));
+    init.MoveTo(PositionToVector3(destination), true, true);
     init.SetFacing(destination.GetOrientation());
     init.SetWalk(false);
     init.Launch();

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp

@@ -436,6 +436,7 @@ struct boss_nefarian : public BossAI
         _phase3 = false;
         _despawn = false;
         _despawnTimer = 30000;
+        _sayLowHealth = false;
     }
 
     void Reset() override
@@ -502,8 +503,11 @@ struct boss_nefarian : public BossAI
             Talk(SAY_RAISE_SKELETONS);
         }
 
-        if (me->HealthBelowPctDamaged(5, damage))
+        if (!_sayLowHealth && me->HealthBelowPctDamaged(5, damage))
+        {
+            _sayLowHealth = true;
             Talk(SAY_XHEALTH);
+        }
     }
 
     void UpdateAI(uint32 diff) override
@@ -617,6 +621,7 @@ struct boss_nefarian : public BossAI
     bool _despawn;
     uint32 _despawnTimer;
     bool _phase3;
+    bool _sayLowHealth;
 };
 
 void AddSC_boss_nefarian()