Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

github-actions[bot] · github-actions[bot] · commit 4e4e83c4818e · 2026-04-04T02:01:53.000Z
diff --git a/data/sql/updates/db_characters/2026_04_03_00.sql b/data/sql/updates/db_characters/2026_04_03_00.sql
@@ -0,0 +1,19 @@
+-- DB update 2026_03_30_00 -> 2026_04_03_00
+--
+CREATE TABLE `spam_reports` (
+    `ID` INT UNSIGNED NOT NULL AUTO_INCREMENT,
+    `SpamType` TINYINT UNSIGNED NOT NULL COMMENT '0 = mail, 1 = chat, 2 = calendar',
+    `SpammerGuid` INT UNSIGNED NOT NULL DEFAULT '0',
+    `Unk1` INT UNSIGNED NULL DEFAULT '0',
+    `MailIdOrMessageType` INT UNSIGNED NULL DEFAULT '0',
+    `ChannelId` INT UNSIGNED NULL COMMENT 'Only used if SpamType = 1',
+    `SecondsSinceMessage` INT UNSIGNED NULL COMMENT 'Only used if SpamType = 1',
+    `Description` LONGTEXT NULL DEFAULT NULL COLLATE 'utf8mb4_unicode_ci',
+    `Time` INT NULL DEFAULT NULL COMMENT 'Time of report',
+    PRIMARY KEY (`ID`) USING BTREE
+)
+CHARSET = utf8mb4
+COLLATE = utf8mb4_unicode_ci
+ENGINE = InnoDB
+ROW_FORMAT = DEFAULT
+;
diff --git a/data/sql/updates/db_world/2026_04_03_00.sql b/data/sql/updates/db_world/2026_04_03_00.sql
@@ -0,0 +1,4 @@
+-- DB update 2026_03_31_00 -> 2026_04_03_00
+--
+-- from mechanic_immune_mask 646000477 to school=0x10(FROST)
+UPDATE `creature_template` SET `CreatureImmunitiesId`=-6 WHERE `entry`=510;
diff --git a/data/sql/updates/db_world/2026_04_03_01.sql b/data/sql/updates/db_world/2026_04_03_01.sql
@@ -0,0 +1,26 @@
+-- DB update 2026_04_03_00 -> 2026_04_03_01
+DELETE FROM `waypoint_data` WHERE `id` = 2669000;
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(2669000, 1, 478.743, -505.576, 104.724, 0, 0, 1, 0, 100, 0),
+(2669000, 2, 318.177, -503.8898, 104.5326, 0, 0, 1, 0, 100, 0);
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26690 AND `source_type` = 0 AND `id` IN (2);
+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_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(26690, 0, 2, 0, 109, 0, 100, 0, 0, 2669000, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Ymirjar Warrior - On Path 2669000 Finished - Set In Combat With Zone');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26691 AND `source_type` = 0 AND `id` IN (2);
+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_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(26691, 0, 2, 0, 109, 0, 100, 0, 0, 2669000, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Ymirjar Witch Doctor - On Path 2669000 Finished - Set In Combat With Zone');
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26692 AND `source_type` = 0 AND `id` IN (3);
+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_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(26692, 0, 3, 0, 109, 0, 100, 0, 0, 2669000, 0, 0, 0, 38, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Ymirjar Harpooner - On Path 2669000 Finished - Set In Combat With Zone');
+
+UPDATE `spell_area` SET `gender` = 2 WHERE `spell` = 47546;
+
+DELETE FROM `waypoint_data` WHERE `id` IN (2689303, 2689304);
+INSERT INTO `waypoint_data` (`id`, `point`, `position_x`, `position_y`, `position_z`, `orientation`, `delay`, `move_type`, `action`, `action_chance`, `wpguid`) VALUES
+(2689303, 1, 520.483, -541.563, 119.842, 0, 0, 2, 0, 100, 0),
+(2689303, 2, 496.434, -517.578, 120, 0, 0, 2, 0, 100, 0),
+(2689304, 1, 520.483, -541.563, 119.842, 0, 0, 2, 0, 100, 0),
+(2689304, 2, 500.243, -501.693, 120, 0, 0, 2, 0, 100, 0);
diff --git a/data/sql/updates/db_world/2026_04_03_02.sql b/data/sql/updates/db_world/2026_04_03_02.sql
@@ -0,0 +1,3 @@
+-- DB update 2026_04_03_01 -> 2026_04_03_02
+-- Add CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT to Toxic Tunnel (Naxxramas)
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` | 0x00002000 WHERE `entry` = 16400;
diff --git a/data/sql/updates/db_world/2026_04_03_03.sql b/data/sql/updates/db_world/2026_04_03_03.sql
@@ -0,0 +1,6 @@
+-- DB update 2026_04_03_02 -> 2026_04_03_03
+-- Fix Skadi Poisoned Spear not applying periodic DOT in Heroic mode.
+-- Spell 59331 is the heroic variant of 50255 (mapped via spelldifficulty_dbc),
+-- but the spell script was only registered for the normal version.
+DELETE FROM `spell_script_names` WHERE `spell_id` = 59331 AND `ScriptName` = 'spell_skadi_poisoned_spear';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (59331, 'spell_skadi_poisoned_spear');
diff --git a/src/server/apps/worldserver/worldserver.conf.dist b/src/server/apps/worldserver/worldserver.conf.dist
@@ -612,6 +612,15 @@ AllowLoggingIPAddressesInDatabase = 1
 
 Allow.IP.Based.Action.Logging = 0
 
+#
+#    LogSpamReports
+#        Description: Allow logging spam reports from players in the chat, mail or calendar into the database.
+#        Default:     1 - (Enabled)
+#                     0 - (Disabled)
+#
+
+LogSpamReports = 1
+
 #
 #  Appender config values: Given an appender "name"
 #    Appender.name
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp
@@ -353,6 +353,7 @@ void CharacterDatabaseConnection::DoPrepareStatements()
     PrepareStatement(CHAR_UPD_REM_AT_LOGIN_FLAG, "UPDATE characters set at_login = at_login & ~ ? WHERE guid = ?", CONNECTION_ASYNC);
     PrepareStatement(CHAR_UPD_ALL_AT_LOGIN_FLAGS, "UPDATE characters SET at_login = at_login | ?", CONNECTION_ASYNC);
     PrepareStatement(CHAR_INS_BUG_REPORT, "INSERT INTO bugreport (type, content) VALUES(?, ?)", CONNECTION_ASYNC);
+    PrepareStatement(CHAR_INS_SPAM_REPORT, "INSERT INTO spam_reports (SpamType, SpammerGuid, Unk1, MailIdOrMessageType, ChannelId, SecondsSinceMessage, Description, Time) VALUES (?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC);
     PrepareStatement(CHAR_UPD_PETITION_NAME, "UPDATE petition SET name = ? WHERE petition_id = ?", CONNECTION_ASYNC);
     PrepareStatement(CHAR_INS_PETITION_SIGNATURE, "INSERT INTO petition_sign (ownerguid, petition_id, playerguid, player_account) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC);
     PrepareStatement(CHAR_UPD_ACCOUNT_ONLINE, "UPDATE characters SET online = 0 WHERE account = ?", CONNECTION_ASYNC);
diff --git a/src/server/database/Database/Implementation/CharacterDatabase.h b/src/server/database/Database/Implementation/CharacterDatabase.h
@@ -277,6 +277,7 @@ enum CharacterDatabaseStatements : uint32
     CHAR_UPD_REM_AT_LOGIN_FLAG,
     CHAR_UPD_ALL_AT_LOGIN_FLAGS,
     CHAR_INS_BUG_REPORT,
+    CHAR_INS_SPAM_REPORT,
     CHAR_UPD_PETITION_NAME,
     CHAR_INS_PETITION_SIGNATURE,
     CHAR_UPD_ACCOUNT_ONLINE,
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
@@ -666,6 +666,8 @@ bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data, bool changele
         ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);
     }
 
+    SetIsCombatDisallowed(cInfo->HasFlagsExtra(CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT));
+
     SetDetectionDistance(cInfo->detection_range);
 
     // Update movement
diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h
@@ -56,7 +56,7 @@ enum CreatureFlagsExtra : uint32
     CREATURE_FLAG_EXTRA_GHOST_VISIBILITY                = 0x00000400,   // creature will only be visible to dead players
     CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK              = 0x00000800,   // creature will use offhand attacks
     CREATURE_FLAG_EXTRA_NO_SELL_VENDOR                  = 0x00001000,   // players can't sell items to this vendor
-    CREATURE_FLAG_EXTRA_IGNORE_COMBAT                   = 0x00002000,
+    CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT             = 0x00002000,   // creature is not allowed to enter combat
     CREATURE_FLAG_EXTRA_WORLDEVENT                      = 0x00004000,   // custom flag for world event creatures (left room for merging)
     CREATURE_FLAG_EXTRA_GUARD                           = 0x00008000,   // Creature is guard
     CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH              = 0x00010000,   // creature ignores feign death
diff --git a/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp b/src/server/game/Entities/Creature/enuminfo_CreatureData.cpp
@@ -44,7 +44,7 @@ AC_API_EXPORT EnumText EnumUtils<CreatureFlagsExtra>::ToString(CreatureFlagsExtr
         case CREATURE_FLAG_EXTRA_GHOST_VISIBILITY: return { "CREATURE_FLAG_EXTRA_GHOST_VISIBILITY", "CREATURE_FLAG_EXTRA_GHOST_VISIBILITY", "creature will only be visible to dead players" };
         case CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK: return { "CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK", "CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK", "/ @todo: Implement CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK (creature will use offhand attacks)" };
         case CREATURE_FLAG_EXTRA_NO_SELL_VENDOR: return { "CREATURE_FLAG_EXTRA_NO_SELL_VENDOR", "CREATURE_FLAG_EXTRA_NO_SELL_VENDOR", "players can't sell items to this vendor" };
-        case CREATURE_FLAG_EXTRA_IGNORE_COMBAT: return { "CREATURE_FLAG_EXTRA_IGNORE_COMBAT", "CREATURE_FLAG_EXTRA_IGNORE_COMBAT", "" };
+        case CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT: return { "CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT", "CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT", "creature is not allowed to enter combat" };
         case CREATURE_FLAG_EXTRA_WORLDEVENT: return { "CREATURE_FLAG_EXTRA_WORLDEVENT", "CREATURE_FLAG_EXTRA_WORLDEVENT", "custom flag for world event creatures (left room for merging)" };
         case CREATURE_FLAG_EXTRA_GUARD: return { "CREATURE_FLAG_EXTRA_GUARD", "CREATURE_FLAG_EXTRA_GUARD", "Creature is guard" };
         case CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH: return { "CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH", "CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH", "creature ignores feign death" };
@@ -88,7 +88,7 @@ AC_API_EXPORT CreatureFlagsExtra EnumUtils<CreatureFlagsExtra>::FromIndex(std::s
         case 10: return CREATURE_FLAG_EXTRA_GHOST_VISIBILITY;
         case 11: return CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK;
         case 12: return CREATURE_FLAG_EXTRA_NO_SELL_VENDOR;
-        case 13: return CREATURE_FLAG_EXTRA_IGNORE_COMBAT;
+        case 13: return CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT;
         case 14: return CREATURE_FLAG_EXTRA_WORLDEVENT;
         case 15: return CREATURE_FLAG_EXTRA_GUARD;
         case 16: return CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH;
@@ -129,7 +129,7 @@ AC_API_EXPORT std::size_t EnumUtils<CreatureFlagsExtra>::ToIndex(CreatureFlagsEx
         case CREATURE_FLAG_EXTRA_GHOST_VISIBILITY: return 10;
         case CREATURE_FLAG_EXTRA_USE_OFFHAND_ATTACK: return 11;
         case CREATURE_FLAG_EXTRA_NO_SELL_VENDOR: return 12;
-        case CREATURE_FLAG_EXTRA_IGNORE_COMBAT: return 13;
+        case CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT: return 13;
         case CREATURE_FLAG_EXTRA_WORLDEVENT: return 14;
         case CREATURE_FLAG_EXTRA_GUARD: return 15;
         case CREATURE_FLAG_EXTRA_IGNORE_FEIGN_DEATH: return 16;
diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp
@@ -754,11 +754,21 @@ void WorldSession::HandleCalendarEventModeratorStatus(WorldPacket& recvData)
 
 void WorldSession::HandleCalendarComplain(WorldPackets::Calendar::CalendarComplain& packet)
 {
-    ObjectGuid guid = _player->GetGUID();
-
-    LOG_DEBUG("network", "CMSG_CALENDAR_COMPLAIN [{}] EventId [{}] guid [{}]", guid.ToString(), packet.EventId, packet.ComplainGuid.ToString());
-
-    // what to do with complains?
+    if (sWorld->getBoolConfig(CONFIG_LOGSPAMREPORTS))
+    {
+        CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_SPAM_REPORT);
+
+        stmt->SetData(0, 2); // SpamType 2 = Calendar
+        stmt->SetData(1, packet.ComplainGuid.GetCounter());
+        stmt->SetData(2, 0);
+        stmt->SetData(3, 0);
+        stmt->SetData(4, 0);
+        stmt->SetData(5, 0);
+        stmt->SetData(6, "EventId: " + std::to_string(packet.EventId));
+        stmt->SetData(7, GameTime::GetGameTime().count());
+
+        CharacterDatabase.Execute(stmt);
+    }
 }
 
 void WorldSession::HandleCalendarGetNumPending(WorldPacket& /*recvData*/)
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
@@ -1181,8 +1181,21 @@ void WorldSession::HandleComplainOpcode(WorldPackets::Misc::Complain& packet)
     // Complaint Received message
     SendPacket(WorldPackets::Misc::ComplainResult().Write());
 
-    LOG_DEBUG("network", "REPORT SPAM: type {}, {}, unk1 {}, unk2 {}, unk3 {}, unk4 {}, message {}",
-        packet.SpamType, packet.SpammerGuid.ToString(), packet.Unk1, packet.Unk2, packet.Unk3, packet.Unk4, packet.Description);
+    if (sWorld->getBoolConfig(CONFIG_LOGSPAMREPORTS))
+    {
+        CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_SPAM_REPORT);
+
+        stmt->SetData(0, packet.SpamType);
+        stmt->SetData(1, packet.SpammerGuid.GetCounter());
+        stmt->SetData(2, packet.Unk1);
+        stmt->SetData(3, packet.MailIdOrMessageType);
+        stmt->SetData(4, packet.ChannelId);
+        stmt->SetData(5, packet.SecondsSinceMessage);
+        stmt->SetData(6, packet.Description);
+        stmt->SetData(7, GameTime::GetGameTime().count());
+
+        CharacterDatabase.Execute(stmt);
+    }
 }
 
 void WorldSession::HandleRealmSplitOpcode(WorldPacket& recv_data)
diff --git a/src/server/game/Loot/LootMgr.cpp b/src/server/game/Loot/LootMgr.cpp
@@ -405,10 +405,10 @@ LootItem::LootItem(LootStoreItem const& li)
     randomSuffix = GenerateEnchSuffixFactor(itemid);
     randomPropertyId = Item::GenerateItemRandomPropertyId(itemid);
     count = 0;
-    is_looted = 0;
-    is_blocked = 0;
-    is_underthreshold = 0;
-    is_counted = 0;
+    is_looted = false;
+    is_blocked = false;
+    is_underthreshold = false;
+    is_counted = false;
     rollWinnerGUID = ObjectGuid::Empty;
     groupid = li.groupid;
 }
diff --git a/src/server/game/Server/Packets/CalendarPackets.cpp b/src/server/game/Server/Packets/CalendarPackets.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "CalendarPackets.h"
+#include "Packet.h"
 
 void WorldPackets::Calendar::GetEvent::Read()
 {
diff --git a/src/server/game/Server/Packets/MiscPackets.cpp b/src/server/game/Server/Packets/MiscPackets.cpp
@@ -149,14 +149,14 @@ void WorldPackets::Misc::Complain::Read()
     {
     case 0:
         _worldPacket >> Unk1; // const 0
-        _worldPacket >> Unk2; // probably mail id
-        _worldPacket >> Unk3; // const 0
+        _worldPacket >> MailIdOrMessageType; // probably mail id
+        _worldPacket >> ChannelId; // const 0
         break;
     case 1:
         _worldPacket >> Unk1; // probably language
-        _worldPacket >> Unk2; // message type?
-        _worldPacket >> Unk3; // probably channel id
-        _worldPacket >> Unk4; // unk random value
+        _worldPacket >> MailIdOrMessageType;
+        _worldPacket >> ChannelId;
+        _worldPacket >> SecondsSinceMessage;
         _worldPacket >> Description; // spam description string (messagetype, channel name, player name, message)
         break;
     }
diff --git a/src/server/game/Server/Packets/MiscPackets.h b/src/server/game/Server/Packets/MiscPackets.h
@@ -218,13 +218,13 @@ namespace WorldPackets
 
             void Read() override;
 
-            uint8 SpamType = 0; // 0 - mail, 1 - chat
+            uint8 SpamType              = 0; // 0 - mail, 1 - chat
             ObjectGuid SpammerGuid;
-            uint32 Unk1 = 0;
-            uint32 Unk2 = 0;
-            uint32 Unk3 = 0;
-            uint32 Unk4 = 0;
-            std::string Description = "";
+            uint32 Unk1                 = 0;
+            uint32 MailIdOrMessageType  = 0;
+            uint32 ChannelId            = 0;
+            uint32 SecondsSinceMessage  = 0;
+            std::string Description     = "";
         };
 
         class ComplainResult final : public ServerPacket
diff --git a/src/server/game/World/WorldConfig.cpp b/src/server/game/World/WorldConfig.cpp
@@ -603,6 +603,8 @@ void WorldConfig::BuildConfigCache()
 
     SetConfigValue<bool>(CONFIG_IP_BASED_ACTION_LOGGING, "Allow.IP.Based.Action.Logging", false);
 
+    SetConfigValue<bool>(CONFIG_LOGSPAMREPORTS, "LogSpamReports", true);
+
     // Whether to use LoS from game objects
     SetConfigValue<bool>(CONFIG_CHECK_GOBJECT_LOS, "CheckGameObjectLoS", true);
 
diff --git a/src/server/game/World/WorldConfig.h b/src/server/game/World/WorldConfig.h
@@ -112,6 +112,7 @@ enum ServerConfigs
     CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING,
     CONFIG_MINIGOB_MANABONK,
     CONFIG_IP_BASED_ACTION_LOGGING,
+    CONFIG_LOGSPAMREPORTS,
     CONFIG_CALCULATE_CREATURE_ZONE_AREA_DATA,
     CONFIG_CALCULATE_GAMEOBJECT_ZONE_AREA_DATA,
     CONFIG_CHECK_GOBJECT_LOS,
diff --git a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/boss_sartharion.cpp
@@ -136,7 +136,7 @@ enum Misc
     // Movement points
     POINT_LANDING                               = 1,
 
-    // Lava directions. Its used to identify to which side lava was moving by last time
+    // Lava directions
     LAVA_LEFT_SIDE                              = 0,
     LAVA_RIGHT_SIDE                             = 1,
 
@@ -307,7 +307,6 @@ struct boss_sartharion : public BossAI
 {
     explicit boss_sartharion(Creature* creature) : BossAI(creature, DATA_SARTHARION),
         dragonsCount(0),
-        lastLavaSide(LAVA_RIGHT_SIDE),
         usedBerserk(false),
         below11PctReached(false)
     {
@@ -628,8 +627,8 @@ struct boss_sartharion : public BossAI
         extraEvents.ScheduleEvent(EVENT_SARTHARION_START_LAVA, 3600ms);
         extraEvents.ScheduleEvent(EVENT_SARTHARION_FINISH_LAVA, 11s);
 
-        // Send wave from left
-        if (lastLavaSide == LAVA_RIGHT_SIDE)
+        // Randomly choose which side the wave comes from
+        if (urand(LAVA_LEFT_SIDE, LAVA_RIGHT_SIDE) == LAVA_LEFT_SIDE)
         {
             for (uint8 i = 0; i < MAX_LEFT_LAVA_TSUNAMIS; ++i)
             {
@@ -638,10 +637,7 @@ struct boss_sartharion : public BossAI
                 if (((i - 1) % 3 == 0) && tsunami) // If center of wave
                     tsunami->CastSpell(tsunami, SPELL_FLAME_TSUNAMI_VISUAL, true);
             }
-
-            lastLavaSide = LAVA_LEFT_SIDE;
         }
-        // from right
         else
         {
             for (uint8 i = 0; i < MAX_RIGHT_LAVA_TSUNAMIS; ++i)
@@ -651,8 +647,6 @@ struct boss_sartharion : public BossAI
                 if (((i - 1) % 3 == 0) && tsunami) // If center of wave
                     tsunami->CastSpell(tsunami, SPELL_FLAME_TSUNAMI_VISUAL, true);
             }
-
-            lastLavaSide = LAVA_RIGHT_SIDE;
         }
     }
 
@@ -683,7 +677,6 @@ struct boss_sartharion : public BossAI
     EventMap extraEvents;
     std::list<uint32> volcanoBlows;
     uint8 dragonsCount;
-    uint8 lastLavaSide; // 0 = left, 1 = right
     bool usedBerserk;
     bool below11PctReached;
 };
diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_skadi.cpp
diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-- DB update 2026_04_03_01 -> 2026_04_03_02`
	`2`	`+-- Add CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT to Toxic Tunnel (Naxxramas)`
	`3`	+UPDATE `creature_template` SET `flags_extra` = `flags_extra` \| 0x00002000 WHERE `entry` = 16400;
Original file line number	Diff line number	Diff line change
`@@ -666,6 +666,8 @@ bool Creature::UpdateEntry(uint32 Entry, const CreatureData* data, bool changele`
`666`	`666`	`ApplySpellImmune(0, IMMUNITY_EFFECT, SPELL_EFFECT_ATTACK_ME, true);`
`667`	`667`	`}`
`668`	`668`
	`669`	`+ SetIsCombatDisallowed(cInfo->HasFlagsExtra(CREATURE_FLAG_EXTRA_CANNOT_ENTER_COMBAT));`
	`670`	`+`
`669`	`671`	`SetDetectionDistance(cInfo->detection_range);`
`670`	`672`
`671`	`673`	`// Update movement`