Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

Author: github-actions[bot]

apps/codestyle/codestyle-sql.py

@@ -191,7 +191,7 @@ def insert_delete_safety_check(file: io, file_path: str) -> None:
 
     # Parse all the file
     for line_number, line in enumerate(file, start = 1):
-        if line.startswith("--"):
+        if line.strip().startswith("--"):
             continue
         if "INSERT" in line and "DELETE" not in previous_line:
             print(f"❌ No DELETE keyword found before the INSERT in {file_path} at line {line_number}\nIf this error is intended, please notify a maintainer")
@@ -323,11 +323,13 @@ def backtick_check(file: io, file_path: str) -> None:
 
     for line_number, line in enumerate(file, start=1):
         # Ignore comments
-        if line.startswith('--'):
+        if line.strip().startswith('--'):
             continue
 
         # Sanitize single- and doublequotes to prevent false positives
         sanitized_line = quote_pattern.sub('', line)
+        # Strip inline comments (safe to do after removing quoted strings)
+        sanitized_line = re.sub(r'--.*$', '', sanitized_line)
         matches = pattern.findall(sanitized_line)
 
         for clause, content in matches:

apps/installer/includes/os_configs/windows.sh

@@ -24,6 +24,6 @@ fi
 
 choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=System'
 choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  visualstudio2022-workload-nativedesktop
-choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  openssl --force --version=3.5.4
+choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  openssl --force --version=3.6.1
 choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  boost-msvc-14.3 --force --version=1.87.0
 choco install -y --skip-checksums "${INSTALL_ARGS[@]}"  mysql --force --version=8.4.6

data/sql/updates/db_world/2026_01_31_00.sql

@@ -0,0 +1,3 @@
+-- DB update 2026_01_30_01 -> 2026_01_31_00
+--
+UPDATE `creature_loot_template` SET `Chance` = 40 WHERE `Item` = 42422 AND `Entry` IN (29880, 30037, 30243, 30250, 30632, 30725);

data/sql/updates/db_world/2026_01_31_01.sql

@@ -0,0 +1,3 @@
+-- DB update 2026_01_31_00 -> 2026_01_31_01
+--
+UPDATE `creature_template` SET `faction` = 634 WHERE (`entry` IN (23772, 29479));

data/sql/updates/db_world/2026_01_31_02.sql

@@ -129,6 +129,15 @@ class boss_thaddius : public CreatureScript
         uint32 resetTimer{};
         bool ballLightningEnabled;
 
+        bool IsAnyPlayerInMeleeRange() const
+        {
+            for (auto const& ref : me->GetThreatMgr().GetThreatList())
+                if (Unit* target = ref->getTarget())
+                    if (target->IsPlayer() && me->IsWithinMeleeRange(target))
+                        return true;
+            return false;
+        }
+
         void DoAction(int32 param) override
         {
             if (param == ACTION_SUMMON_DIED)
@@ -327,17 +336,11 @@ class boss_thaddius : public CreatureScript
                     break;
             }
 
-            if (me->IsWithinMeleeRange(me->GetVictim()))
-            {
+            if (IsAnyPlayerInMeleeRange())
                 DoMeleeAttackIfReady();
-            }
-            else if (ballLightningEnabled)
-            {
+            else if (ballLightningEnabled && !IsAnyPlayerInMeleeRange())
                 if (Unit* target = SelectTarget(SelectTargetMethod::MaxThreat))
-                {
                     me->CastSpell(target, SPELL_BALL_LIGHTNING, false);
-                }
-            }
         }
     };
 };

data/sql/updates/db_world/2026_01_31_03.sql

@@ -188,16 +188,9 @@ enum MalygosLightOverrides
     LIGHT_OBSCURE_ARCANE_RUNES       = 1825,
 };
 
-struct boss_malygos : public ScriptedAI
+struct boss_malygos : public BossAI
 {
-    boss_malygos(Creature* c) : ScriptedAI(c), summons(me)
-    {
-        pInstance = me->GetInstanceScript();
-    }
-
-    InstanceScript* pInstance;
-    EventMap events;
-    SummonList summons;
+    boss_malygos(Creature* creature) : BossAI(creature, DATA_MALYGOS) { }
 
     uint32 timer1, timer2;
     uint8 IntroCounter;
@@ -211,9 +204,7 @@ struct boss_malygos : public ScriptedAI
 
     void Reset() override
     {
-        events.Reset();
-        events.SetPhase(PHASE_NONE);
-        summons.DespawnAll();
+        _Reset();
 
         timer1 = MalygosIntroIntervals[4];
         timer2 = INTRO_MOVEMENT_INTERVAL;
@@ -226,11 +217,7 @@ struct boss_malygos : public ScriptedAI
 
         me->SetAnimTier(AnimTier::Fly);
 
-        if (pInstance)
-        {
-            pInstance->SetData(DATA_ENCOUNTER_STATUS, NOT_STARTED);
-            pInstance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_YOU_DONT_HAVE_AN_ENTERNITY_EVENT);
-        }
+        instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_YOU_DONT_HAVE_AN_ENTERNITY_EVENT);
     }
 
     void MovementInform(uint32 type, uint32 id) override
@@ -305,14 +292,10 @@ struct boss_malygos : public ScriptedAI
 
     void JustEngagedWith(Unit*  /*who*/) override
     {
+        _JustEngagedWith();
         events.Reset();
-        DoZoneInCombat();
-
         Talk(SAY_PHASE_1);
-
         events.RescheduleEvent(EVENT_INTRO_MOVE_CENTER, 0ms, 1);
-        if (pInstance)
-            pInstance->SetData(DATA_ENCOUNTER_STATUS, IN_PROGRESS);
     }
 
     void AttackStart(Unit* victim) override
@@ -372,8 +355,7 @@ struct boss_malygos : public ScriptedAI
             break;
         case EVENT_INTRO_MOVE_CENTER:
         {
-            if (pInstance)
-                pInstance->SetData(DATA_SET_IRIS_INACTIVE, 0);
+            instance->SetData(DATA_SET_IRIS_INACTIVE, 0);
             summons.DespawnAll();
             me->InterruptNonMeleeSpells(true);
             me->RemoveAllAuras();
@@ -392,11 +374,8 @@ struct boss_malygos : public ScriptedAI
         }
         case EVENT_START_FIGHT:
         {
-            if (pInstance)
-            {
-                pInstance->SetData(DATA_HIDE_IRIS_AND_PORTAL, 0);
-                pInstance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_YOU_DONT_HAVE_AN_ENTERNITY_EVENT);
-            }
+            instance->SetData(DATA_HIDE_IRIS_AND_PORTAL, 0);
+            instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_YOU_DONT_HAVE_AN_ENTERNITY_EVENT);
             me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_PACIFIED);
             if (Unit* target = me->SelectNearestTarget(250.0f))
             {
@@ -689,19 +668,16 @@ struct boss_malygos : public ScriptedAI
 
             me->GetThreatMgr().ClearAllThreat(); // players on vehicle are unattackable -> leads to EnterEvadeMode() because target is not acceptable!
 
-            // mount players:
-            Map::PlayerList const& PlayerList = me->GetMap()->GetPlayers();
-            if (!PlayerList.IsEmpty())
-                for (Map::PlayerList::const_iterator i = PlayerList.begin(); i != PlayerList.end(); ++i)
-                    if (Player* player = i->GetSource())
-                    {
-                        sScriptMgr->AnticheatSetUnderACKmount(player);
-
-                        if (!player->IsAlive() || player->IsGameMaster())
-                            continue;
+            me->GetMap()->DoForAllPlayers([&](Player* player)
+            {
+                if (player->IsAlive() && !player->IsGameMaster())
+                {
+                    sScriptMgr->AnticheatSetUnderACKmount(player);
+                    player->CastSpell(player, SPELL_SUMMON_RED_DRAGON_BUDDY, true);
+                }
+            });
 
-                        player->CastSpell(player, SPELL_SUMMON_RED_DRAGON_BUDDY, true);
-                    }
+            DoZoneInCombat();
 
             events.RescheduleEvent(EVENT_SAY_PHASE_3_INTRO, 3s, 1);
         }
@@ -744,12 +720,9 @@ struct boss_malygos : public ScriptedAI
 
     void JustDied(Unit*  /*killer*/) override
     {
+        _JustDied();
         Talk(SAY_DEATH);
-        if (pInstance)
-        {
-            pInstance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, NPC_MALYGOS, 1);
-            pInstance->SetData(DATA_ENCOUNTER_STATUS, DONE);
-        }
+        instance->DoUpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_KILL_CREATURE, NPC_MALYGOS, 1);
     }
 
     void KilledUnit(Unit* victim) override

src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp

@@ -24,6 +24,8 @@
 #define DataHeader "EOE"
 #define EyeOfEternityScriptName "instance_eye_of_eternity"
 
+uint32 const EncounterCount = 1;
+
 enum Objects
 {
     GO_NEXUS_PLATFORM           = 193070,
@@ -52,8 +54,8 @@ enum NPCs
 
 enum Data
 {
+    DATA_MALYGOS                = 0,
     DATA_IRIS_ACTIVATED,
-    DATA_ENCOUNTER_STATUS,
     DATA_SET_IRIS_INACTIVE,
     DATA_HIDE_IRIS_AND_PORTAL,
     DATA_MALYGOS_GUID,
@@ -87,6 +89,11 @@ enum eAchiev
     ACHIEV_YOU_DONT_HAVE_AN_ENTERNITY_EVENT = 20387,
 };
 
+enum EoEMisc : uint32
+{
+    EVENT_IRIS_ACTIVATED                    = 20158
+};
+
 /*** POSITIONS/WAYPOINTS BELOW ***/
 
 #define INTRO_MOVEMENT_INTERVAL 25000