Merge branch 'azerothcore:master' into master

Author: LannyE

data/sql/updates/db_world/2026_02_21_04.sql

@@ -0,0 +1,25 @@
+-- DB update 2026_02_21_03 -> 2026_02_21_04
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (56105, 55873);
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(56105, 'spell_malygos_vortex_dummy'),
+(55873, 'spell_malygos_vortex_visual');
+
+DELETE FROM `creature` WHERE `guid` IN (132304, 132305, 132306, 132307, 132308);
+INSERT INTO `creature`
+(`guid`, `id1`, `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`)
+VALUES
+(132304,30090,616,0,0,3,1,0,754.733,1301.51,283.379,5.58505,3600,0,0,12600,0,0,0,0,0,'',0),
+(132305,30090,616,0,0,3,1,0,754.521,1301.23,279.524,0.680678,3600,0,0,12600,0,0,0,0,0,'',0),
+(132306,30090,616,0,0,3,1,0,754.356,1301.48,285.733,5.96903,3600,0,0,12600,0,0,0,0,0,'',0),
+(132307,30090,616,0,0,3,1,0,754.192,1301.18,281.851,5.75959,3600,0,0,12600,0,0,0,0,0,'',0),
+(132308,30090,616,0,0,3,1,0,754.688,1301.8,287.295,1.25664,3600,0,0,12600,0,0,0,0,0,'',0);
+
+UPDATE `creature_template` SET `unit_flags` = `unit_flags`|33554432, `VehicleId` = 214, `flags_extra` = `flags_extra`|2|128, `ScriptName` = '' WHERE `entry` = 30090;
+
+DELETE FROM `creature_template_addon` WHERE `entry` = 30090;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(30090, 0, 0, 0, 0, 0, 0, '55883');

data/sql/updates/db_world/2026_02_22_00.sql

@@ -0,0 +1,9 @@
+-- DB update 2026_02_21_04 -> 2026_02_22_00
+--
+DELETE FROM `creature_template_addon` WHERE `entry` = 30084;
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(30084, 0, 0, 0, 0, 0, 0, '55845');
+
+DELETE FROM `creature_template_movement` WHERE `CreatureId` = 30084;
+INSERT INTO `creature_template_movement` (`CreatureId`, `Flight`) VALUES
+(30084, 1);

data/sql/updates/db_world/2026_02_22_01.sql

@@ -0,0 +1,3 @@
+-- DB update 2026_02_22_00 -> 2026_02_22_01
+--
+UPDATE `gameobject_template` SET `ScriptName` = '' WHERE `entry` IN (193958, 193960) AND `ScriptName` = 'go_the_focusing_iris';

src/server/apps/worldserver/CommandLine/CliRunnable.cpp

@@ -25,7 +25,9 @@
 #include "World.h"
 #include <fmt/core.h>
 
-#if AC_PLATFORM != AC_PLATFORM_WINDOWS
+#if AC_PLATFORM == AC_PLATFORM_WINDOWS
+#include <windows.h>
+#else
 #include "Chat.h"
 #include "ChatCommand.h"
 #include <cstring>
@@ -108,6 +110,10 @@ int kb_hit_return()
 void CliThread()
 {
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS
+    // Set console code pages to UTF-8
+    SetConsoleCP(CP_UTF8);
+    SetConsoleOutputCP(CP_UTF8);
+
     // print this here the first time
     // later it will be printed after command queue updates
     PrintCliPrefix();
@@ -134,6 +140,14 @@ void CliThread()
         fInfo.dwTimeout = 0;
         FlashWindowEx(&fInfo);
     }
+
+    // Get console input handle once for reading commands
+    HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE);
+    if (hStdIn == INVALID_HANDLE_VALUE)
+    {
+        LOG_ERROR("server.worldserver", "Failed to get console input handle");
+        return;
+    }
 #endif
 
     ///- As long as the World is running (no World::m_stopEvent), get the command line and handle it
@@ -145,12 +159,18 @@ void CliThread()
 
 #if AC_PLATFORM == AC_PLATFORM_WINDOWS
         wchar_t commandbuf[256];
-        if (fgetws(commandbuf, sizeof(commandbuf), stdin))
+        DWORD charsRead = 0;
+
+        if (ReadConsoleW(hStdIn, commandbuf, sizeof(commandbuf) / sizeof(wchar_t) - 1, &charsRead, nullptr))
         {
-            if (!WStrToUtf8(commandbuf, wcslen(commandbuf), command))
+            if (charsRead > 0)
             {
-                PrintCliPrefix();
-                continue;
+                commandbuf[charsRead] = L'\0';
+                if (!WStrToUtf8(commandbuf, charsRead, command))
+                {
+                    PrintCliPrefix();
+                    continue;
+                }
             }
         }
 #else

src/server/game/Spells/Auras/SpellAuraEffects.cpp

@@ -1296,6 +1296,14 @@ void AuraEffect::HandleProc(AuraApplication* aurApp, ProcEventInfo& eventInfo)
 
     switch (GetAuraType())
     {
+        case SPELL_AURA_MOD_CONFUSE:
+        case SPELL_AURA_MOD_FEAR:
+        case SPELL_AURA_MOD_STUN:
+        case SPELL_AURA_MOD_ROOT:
+        case SPELL_AURA_TRANSFORM:
+            HandleBreakableCCAuraProc(aurApp, eventInfo);
+            break;
+        case SPELL_AURA_DUMMY:
         case SPELL_AURA_PROC_TRIGGER_SPELL:
             HandleProcTriggerSpellAuraProc(aurApp, eventInfo);
             break;
@@ -7324,6 +7332,16 @@ void AuraEffect::HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) con
     Unit::ProcSkillsAndAuras(caster, damageInfo.target, procAttacker, procVictim, hitMask, damageInfo.damage, BASE_ATTACK, spellProto, nullptr, GetEffIndex(), nullptr, &dmgInfo);
 }
 
+void AuraEffect::HandleBreakableCCAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo)
+{
+    int32 const damageLeft = GetAmount() - static_cast<int32>(eventInfo.GetDamageInfo()->GetDamage());
+
+    if (damageLeft <= 0)
+        aurApp->GetTarget()->RemoveAura(aurApp);
+    else
+        SetAmount(damageLeft);
+}
+
 void AuraEffect::HandleProcTriggerSpellAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo)
 {
     Unit* triggerCaster = aurApp->GetTarget();

src/server/game/Spells/Auras/SpellAuraEffects.h

@@ -334,6 +334,7 @@ class AuraEffect
     void HandlePeriodicPowerBurnAuraTick(Unit* target, Unit* caster) const;
 
     // aura effect proc handlers
+    void HandleBreakableCCAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo);
     void HandleProcTriggerSpellAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo);
     void HandleProcTriggerSpellWithValueAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo);
     void HandleProcTriggerDamageAuraProc(AuraApplication* aurApp, ProcEventInfo& eventInfo);

src/server/game/Spells/SpellInfoCorrections.cpp

@@ -1954,12 +1954,6 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_DEST_DEST);
     });
 
-    // Vortex (freeze anim)
-    ApplySpellFix({ 55883 }, [](SpellInfo* spellInfo)
-    {
-        spellInfo->AuraInterruptFlags |= AURA_INTERRUPT_FLAG_CHANGE_MAP;
-    });
-
     // Hurl Pyrite
     ApplySpellFix({ 62490 }, [](SpellInfo* spellInfo)
     {

src/server/game/Spells/SpellMgr.cpp

@@ -1822,6 +1822,7 @@ bool InitTriggerAuraData()
     isTriggerAura[SPELL_AURA_ABILITY_IGNORE_AURASTATE] = true;
 
     isAlwaysTriggeredAura[SPELL_AURA_OVERRIDE_CLASS_SCRIPTS] = true;
+    isAlwaysTriggeredAura[SPELL_AURA_MOD_CONFUSE] = true;
     isAlwaysTriggeredAura[SPELL_AURA_MOD_FEAR] = true;
     isAlwaysTriggeredAura[SPELL_AURA_MOD_ROOT] = true;
     isAlwaysTriggeredAura[SPELL_AURA_MOD_STUN] = true;