Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

github-actions[bot] · github-actions[bot] · commit 9e7a604d6186 · 2026-01-17T01:27:05.000Z
diff --git a/data/sql/updates/db_world/2026_01_16_00.sql b/data/sql/updates/db_world/2026_01_16_00.sql
diff --git a/data/sql/updates/db_world/2026_01_17_00.sql b/data/sql/updates/db_world/2026_01_17_00.sql
@@ -0,0 +1,18 @@
+-- DB update 2026_01_16_00 -> 2026_01_17_00
+--
+DELETE FROM `prospecting_loot_template` WHERE (`Entry` = 23424);
+INSERT INTO `prospecting_loot_template` (`Entry`, `Item`, `Reference`, `Chance`, `QuestRequired`, `LootMode`, `GroupId`, `MinCount`, `MaxCount`, `Comment`) VALUES
+(23424, 21929, 0, 0, 0, 1, 1, 1, 2, 'Flame Spessarite'),
+(23424, 23077, 0, 0, 0, 1, 1, 1, 2, 'Blood Garnet'),
+(23424, 23079, 0, 0, 0, 1, 1, 1, 2, 'Deep Peridot'),
+(23424, 23107, 0, 0, 0, 1, 1, 1, 2, 'Shadow Draenite'),
+(23424, 23112, 0, 0, 0, 1, 1, 1, 2, 'Golden Draenite'),
+(23424, 23117, 0, 0, 0, 1, 1, 1, 2, 'Azure Moonstone'),
+(23424, 23436, 0, 4, 0, 1, 2, 1, 1, 'Living Ruby'),
+(23424, 23437, 0, 4, 0, 1, 2, 1, 1, 'Talasite'),
+(23424, 23438, 0, 4, 0, 1, 2, 1, 1, 'Star of Elune'),
+(23424, 23439, 0, 4, 0, 1, 2, 1, 1, 'Noble Topaz'),
+(23424, 23440, 0, 4, 0, 1, 2, 1, 1, 'Dawnstone'),
+(23424, 23441, 0, 4, 0, 1, 2, 1, 1, 'Nightseye');
+
+DELETE FROM `reference_loot_template` WHERE `Entry` = 1000;
diff --git a/data/sql/updates/db_world/2026_01_17_01.sql b/data/sql/updates/db_world/2026_01_17_01.sql
@@ -0,0 +1,11 @@
+-- DB update 2026_01_17_00 -> 2026_01_17_01
+--
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 26261) AND (`source_type` = 0) AND (`id` IN (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`, `event_param6`, `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
+(26261, 0, 0, 0, 8, 0, 100, 512, 47394, 0, 0, 0, 0, 0, 80, 2626100, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Grizzly Hills Giant - On Spellhit \'Kurun\'s Blessing\' - Run Script');
+
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 17) AND (`SourceGroup` = 0) AND (`SourceEntry` = 47394) AND (`SourceId` = 0) AND (`ElseGroup` = 0) AND (`ConditionTypeOrReference` = 29) AND (`ConditionTarget` = 1) AND (`ConditionValue1` = 26417) AND (`ConditionValue2` = 15) AND (`ConditionValue3` = 0);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 47394, 0, 0, 29, 1, 26417, 15, 0, 0, 0, 0, '', 'For Kurun\'s Blessing (47394) to have an effect the target Grizzly Hills Giant (26261) must be engaged with a Runed Giant (26417)');
+
+UPDATE `creature` SET `spawntimesecs` = 120 WHERE `id1` = 26261;
diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp
@@ -542,13 +542,13 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)
         condMeets = object->GetMap()->GetDifficulty() == ConditionValue1;
         break;
     }
-    case CONDITION_RANDOM_DUNGEON:
+    case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:
     {
         if (Unit* unit = object->ToUnit())
         {
-            if (Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself())
+            if (Player* player = unit->ToPlayer())
             {
-                if (sLFGMgr->selectedRandomLfgDungeon(player->GetGUID()))
+                if (sLFGMgr->IsPlayerQueuedForRandomDungeon(player->GetGUID()))
                 {
                     if (!ConditionValue1)
                         condMeets = true;
@@ -803,7 +803,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition()
     case CONDITION_CHARMED:
         mask |= GRID_MAP_TYPE_MASK_CREATURE | GRID_MAP_TYPE_MASK_PLAYER;
         break;
-    case CONDITION_RANDOM_DUNGEON:
+    case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:
         mask |= GRID_MAP_TYPE_MASK_PLAYER;
         break;
     case CONDITION_WORLD_SCRIPT:
@@ -2486,7 +2486,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)
             return false;
         }
         break;
-    case CONDITION_RANDOM_DUNGEON:
+    case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:
         if (cond->ConditionValue1 > 1)
         {
             LOG_ERROR("sql.sql", "RandomDungeon condition has useless data in value1 ({}).", cond->ConditionValue1);
diff --git a/src/server/game/Conditions/ConditionMgr.h b/src/server/game/Conditions/ConditionMgr.h
@@ -88,7 +88,7 @@ enum ConditionTypes
     CONDITION_HAS_AURA_TYPE            = 102,           // aura_type        0              0                  true if has aura type
     CONDITION_WORLD_SCRIPT             = 103,           // conditionId      state          0                  true if WorldState::IsConditionFulfilled returns true
     CONDITION_AI_DATA                  = 104,           // dataId           value          0                  true if AI::GetData returns value
-    CONDITION_RANDOM_DUNGEON           = 105,           // difficulty (0 = any) 0          0                  true if player is queued for a random dungeon via RDF (param1 = Difficulty)
+    CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON = 105,       // checkDifficulty  difficulty     0                  true if player is queued for a random dungeon via RDF
 
     CONDITION_AC_END                   = 106            // placeholder
 };
diff --git a/src/server/game/DungeonFinding/LFGGroupData.cpp b/src/server/game/DungeonFinding/LFGGroupData.cpp
@@ -139,4 +139,13 @@ namespace lfg
         return m_KicksLeft;
     }
 
+    void LfgGroupData::AddRandomQueuedPlayer(ObjectGuid guid)
+    {
+        m_RandomQueuedPlayers.insert(guid);
+    }
+
+    [[nodiscard]] bool LfgGroupData::IsRandomQueuedPlayer(ObjectGuid guid) const
+    {
+        return m_RandomQueuedPlayers.contains(guid);
+    }
 } // namespace lfg
diff --git a/src/server/game/DungeonFinding/LFGGroupData.h b/src/server/game/DungeonFinding/LFGGroupData.h
@@ -37,6 +37,8 @@ namespace lfg
         void SetState(LfgState state);
         void RestoreState();
         void AddPlayer(ObjectGuid guid);
+        void AddRandomQueuedPlayer(ObjectGuid guid);
+        [[nodiscard]] bool IsRandomQueuedPlayer(ObjectGuid guid) const;
         uint8 RemovePlayer(ObjectGuid guid);
         void RemoveAllPlayers();
         void SetLeader(ObjectGuid guid);
@@ -66,6 +68,7 @@ namespace lfg
         LfgState m_OldState;                ///< Old State
         ObjectGuid m_Leader;                ///< Leader GUID
         LfgGuidSet m_Players;               ///< Players in group
+        LfgGuidSet m_RandomQueuedPlayers;   ///< Players that queued for random dungeon
         // Dungeon
         uint32 m_Dungeon;                   ///< Dungeon entry
         bool _isLFGGroup;
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -2583,6 +2583,18 @@ namespace lfg
         GroupsStore[gguid].AddPlayer(guid);
     }
 
+    void LFGMgr::AddPlayerQueuedForRandomDungeonToGroup(ObjectGuid gguid, ObjectGuid guid)
+    {
+        const LfgDungeonSet& dungeons = GetSelectedDungeons(guid);
+        if (dungeons.empty())
+            return;
+
+        uint32 dungeonId = *dungeons.begin();
+        LFGDungeonData const* dungeon = GetLFGDungeon(dungeonId);
+        if (dungeon && (dungeon->type == LFG_TYPE_RANDOM))
+            GroupsStore[gguid].AddRandomQueuedPlayer(guid);
+    }
+
     void LFGMgr::SetLeader(ObjectGuid gguid, ObjectGuid leader)
     {
         GroupsStore[gguid].SetLeader(leader);
@@ -2839,4 +2851,12 @@ namespace lfg
             sDisableMgr->IsDisabledFor(DISABLE_TYPE_LFG_MAP, mapId, nullptr);
     }
 
+    bool LFGMgr::IsPlayerQueuedForRandomDungeon(ObjectGuid guid)
+    {
+        auto gguid = GetGroup(guid);
+        if (!gguid)
+            return false;
+
+        return GroupsStore[gguid].IsRandomQueuedPlayer(guid);
+    }
 } // namespace lfg
diff --git a/src/server/game/DungeonFinding/LFGMgr.h b/src/server/game/DungeonFinding/LFGMgr.h
@@ -506,6 +506,9 @@ namespace lfg
         uint8 RemovePlayerFromGroup(ObjectGuid gguid, ObjectGuid guid);
         /// Adds player to group
         void AddPlayerToGroup(ObjectGuid gguid, ObjectGuid guid);
+        /// Store player that selected random queue to group
+        void AddPlayerQueuedForRandomDungeonToGroup(ObjectGuid gguid, ObjectGuid guid);
+        bool IsPlayerQueuedForRandomDungeon(ObjectGuid guid);
         /// Xinef: Set Random Players Count
         void SetRandomPlayersCount(ObjectGuid guid, uint8 count);
         /// Xinef: Get Random Players Count
diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp
@@ -187,6 +187,7 @@ namespace lfg
 
         sLFGMgr->SetGroup(guid, gguid);
         sLFGMgr->AddPlayerToGroup(gguid, guid);
+        sLFGMgr->AddPlayerQueuedForRandomDungeonToGroup(gguid, guid);
 
         // pussywizard: after all necessary actions handle raid browser
         if (sLFGMgr->GetState(guid) == LFG_STATE_RAIDBROWSER)
diff --git a/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp b/src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
@@ -436,7 +436,7 @@ static Optional<float> GetVelocity(Unit* owner, Unit* target, G3D::Vector3 const
         (owner->IsPet() || owner->IsGuardian() || owner->GetGUID() == target->GetCritterGUID() || owner->GetCharmerOrOwnerGUID() == target->GetGUID()))
     {
         uint32 moveFlags = target->GetUnitMovementFlags();
-        if (target->movespline->isWalking())
+        if (target->IsWalking())
         {
             moveFlags |= MOVEMENTFLAG_WALKING;
         }
@@ -635,7 +635,7 @@ bool FollowMovementGenerator<T>::DoUpdate(T* owner, uint32 time_diff)
         Movement::MoveSplineInit init(owner);
         init.MovebyPath(i_path->GetPath());
         if (_inheritWalkState)
-            init.SetWalk(target->IsWalking() || target->movespline->isWalking());
+            init.SetWalk(target->IsWalking());
 
         if (_inheritSpeed)
             if (Optional<float> velocity = GetVelocity(owner, target, i_path->GetActualEndPosition(), owner->IsGuardian()))
diff --git a/src/server/game/Movement/Spline/MoveSpline.h b/src/server/game/Movement/Spline/MoveSpline.h
@@ -116,7 +116,6 @@ namespace Movement
         [[nodiscard]] bool Finalized() const { return splineflags.done; }
         [[nodiscard]] bool isCyclic() const { return splineflags.cyclic; }
         [[nodiscard]] bool isFalling() const { return splineflags.falling; }
-        [[nodiscard]] bool isWalking() const { return splineflags.walkmode; }
         [[nodiscard]] bool isBoarding() const { return splineflags.transportEnter || splineflags.transportExit; }
         [[nodiscard]] Vector3 FinalDestination() const { return Initialized() ? spline.getPoint(spline.last()) : Vector3(); }
         [[nodiscard]] Vector3 CurrentDestination() const { return Initialized() ? spline.getPoint(point_Idx + 1) : Vector3(); }
diff --git a/src/server/game/Movement/Spline/MoveSplineFlag.h b/src/server/game/Movement/Spline/MoveSplineFlag.h
@@ -40,7 +40,7 @@ namespace Movement
             Falling             = 0x00000200,           // Affects elevation computation, can't be combined with Parabolic flag
             No_Spline           = 0x00000400,
             Parabolic           = 0x00000800,           // Affects elevation computation, can't be combined with Falling flag
-            Walkmode            = 0x00001000,
+            CanSwim             = 0x00001000,
             Flying              = 0x00002000,           // Smooth movement(Catmullrom interpolation mode), flying animation
             OrientationFixed    = 0x00004000,           // Model orientation fixed
             Final_Point         = 0x00008000,
@@ -117,7 +117,7 @@ namespace Movement
         bool falling             : 1;
         bool no_spline           : 1;
         bool parabolic           : 1;
-        bool walkmode            : 1;
+        bool canSwim             : 1;
         bool flying              : 1;
         bool orientationFixed    : 1;
         bool final_point         : 1;
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.cpp b/src/server/game/Movement/Spline/MoveSplineInit.cpp
@@ -118,7 +118,7 @@ namespace Movement
             // If spline is initialized with SetWalk method it only means we need to select
             // walk move speed for it but not add walk flag to unit
             uint32 moveFlagsForSpeed = moveFlags;
-            if (args.flags.walkmode)
+            if (args.walk)
                 moveFlagsForSpeed |= MOVEMENTFLAG_WALKING;
             else
                 moveFlagsForSpeed &= ~MOVEMENTFLAG_WALKING;
@@ -199,7 +199,7 @@ namespace Movement
         args.splineId = splineIdGen.NewId();
         args.TransformForTransport = unit->HasUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT) && unit->GetTransGUID();
         // mix existing state into new
-        args.flags.walkmode = unit->m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);
+        args.walk = unit->m_movementInfo.HasMovementFlag(MOVEMENTFLAG_WALKING);
         args.flags.flying = unit->m_movementInfo.HasMovementFlag((MovementFlags)(MOVEMENTFLAG_CAN_FLY | MOVEMENTFLAG_DISABLE_GRAVITY));
     }
 
diff --git a/src/server/game/Movement/Spline/MoveSplineInit.h b/src/server/game/Movement/Spline/MoveSplineInit.h
@@ -154,7 +154,7 @@ namespace Movement
     };
 
     inline void MoveSplineInit::SetFly() { args.flags.EnableFlying(); }
-    inline void MoveSplineInit::SetWalk(bool enable) { args.flags.walkmode = enable; }
+    inline void MoveSplineInit::SetWalk(bool enable) { args.walk = enable; }
     inline void MoveSplineInit::SetSmooth() { args.flags.EnableCatmullRom(); }
     inline void MoveSplineInit::SetCyclic() { args.flags.cyclic = true; }
     inline void MoveSplineInit::SetFall() { args.flags.EnableFalling(); }
diff --git a/src/server/game/Movement/Spline/MoveSplineInitArgs.h b/src/server/game/Movement/Spline/MoveSplineInitArgs.h
@@ -59,6 +59,7 @@ namespace Movement
         float initialOrientation{0.f};
         bool HasVelocity{false};
         bool TransformForTransport{true};
+        bool walk;
 
         /** Returns true to show that the arguments were configured correctly and MoveSpline initialization will succeed. */
         bool Validate(Unit* unit) const;
diff --git a/src/server/game/Movement/Spline/MovementUtil.cpp b/src/server/game/Movement/Spline/MovementUtil.cpp
@@ -153,7 +153,7 @@ namespace Movement
         STR(Falling      ), // 0x00000200,           // Not Compartible With Trajectory Movement
         STR(No_Spline    ), // 0x00000400,
         STR(Trajectory   ), // 0x00000800,           // Not Compartible With Fall Movement
-        STR(Walkmode     ), // 0x00001000,
+        STR(CanSwim      ), // 0x00001000,
         STR(Flying       ), // 0x00002000,           // Smooth Movement(Catmullrom Interpolation Mode), Flying Animation
         STR(Knockback    ), // 0x00004000,           // Model Orientation Fixed
         STR(Final_Point  ), // 0x00008000,
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
@@ -329,7 +329,7 @@ bool WorldSocket::ReadHeaderHandler()
     return true;
 }
 
-struct AuthSession
+struct ClientAuthSession
 {
     uint32 BattlegroupID = 0;
     uint32 LoginServerType = 0;
@@ -528,7 +528,7 @@ void WorldSocket::SendPacket(WorldPacket const& packet)
 
 void WorldSocket::HandleAuthSession(WorldPacket & recvPacket)
 {
-    std::shared_ptr<AuthSession> authSession = std::make_shared<AuthSession>();
+    std::shared_ptr<ClientAuthSession> authSession = std::make_shared<ClientAuthSession>();
 
     // Read the content of the packet
     recvPacket >> authSession->Build;
@@ -552,7 +552,7 @@ void WorldSocket::HandleAuthSession(WorldPacket & recvPacket)
     _queryProcessor.AddCallback(LoginDatabase.AsyncQuery(stmt).WithPreparedCallback(std::bind(&WorldSocket::HandleAuthSessionCallback, this, authSession, std::placeholders::_1)));
 }
 
-void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<AuthSession> authSession, PreparedQueryResult result)
+void WorldSocket::HandleAuthSessionCallback(std::shared_ptr<ClientAuthSession> authSession, PreparedQueryResult result)
 {
     // Stop if the account is not found
     if (!result)
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
@@ -65,7 +65,7 @@ struct ClientPktHeader
 };
 #pragma pack(pop)
 
-struct AuthSession;
+struct ClientAuthSession;
 
 class AC_GAME_API WorldSocket final : public Socket<WorldSocket>
 {
@@ -113,7 +113,7 @@ class AC_GAME_API WorldSocket final : public Socket<WorldSocket>
     void SendPacketAndLogOpcode(WorldPacket const& packet);
     void HandleSendAuthSession();
     void HandleAuthSession(WorldPacket& recvPacket);
-    void HandleAuthSessionCallback(std::shared_ptr<AuthSession> authSession, PreparedQueryResult result);
+    void HandleAuthSessionCallback(std::shared_ptr<ClientAuthSession> authSession, PreparedQueryResult result);
     void LoadSessionPermissionsCallback(PreparedQueryResult result);
     void SendAuthResponseError(uint8 code);
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp
@@ -90,7 +90,7 @@ struct boss_pathaleon_the_calculator : public BossAI
             me->LoadEquipment(EQUIPMENT_FRENZY);
         });
 
-        scheduler.Schedule(20s, 25s, [this](TaskContext context)
+        scheduler.Schedule(10s, 16s, [this](TaskContext context)
         {
             if (!_isEnraged)
             {
@@ -113,7 +113,7 @@ struct boss_pathaleon_the_calculator : public BossAI
             me->ModifyPower(POWER_MANA, 5000);
             DoCastSelf(SPELL_ARCANE_TORRENT);
             context.Repeat(15s);
-        }).Schedule(10s, 15s, [this](TaskContext context)
+        }).Schedule(10s, 16s, [this](TaskContext context)
         {
             if (DoCastRandomTarget(SPELL_DOMINATION, 0, 50.0f, true, false, false) == SPELL_CAST_OK)
             {

Original file line number	Diff line number	Diff line change
`@@ -542,13 +542,13 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo)`
`542`	`542`	`condMeets = object->GetMap()->GetDifficulty() == ConditionValue1;`
`543`	`543`	`break;`
`544`	`544`	`}`
`545`		`- case CONDITION_RANDOM_DUNGEON:`
	`545`	`+ case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:`
`546`	`546`	`{`
`547`	`547`	`if (Unit* unit = object->ToUnit())`
`548`	`548`	`{`
`549`		`- if (Player* player = unit->GetCharmerOrOwnerPlayerOrPlayerItself())`
	`549`	`+ if (Player* player = unit->ToPlayer())`
`550`	`550`	`{`
`551`		`- if (sLFGMgr->selectedRandomLfgDungeon(player->GetGUID()))`
	`551`	`+ if (sLFGMgr->IsPlayerQueuedForRandomDungeon(player->GetGUID()))`
`552`	`552`	`{`
`553`	`553`	`if (!ConditionValue1)`
`554`	`554`	`condMeets = true;`
`@@ -803,7 +803,7 @@ uint32 Condition::GetSearcherTypeMaskForCondition()`
`803`	`803`	`case CONDITION_CHARMED:`
`804`	`804`	`mask \|= GRID_MAP_TYPE_MASK_CREATURE \| GRID_MAP_TYPE_MASK_PLAYER;`
`805`	`805`	`break;`
`806`		`- case CONDITION_RANDOM_DUNGEON:`
	`806`	`+ case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:`
`807`	`807`	`mask \|= GRID_MAP_TYPE_MASK_PLAYER;`
`808`	`808`	`break;`
`809`	`809`	`case CONDITION_WORLD_SCRIPT:`
`@@ -2486,7 +2486,7 @@ bool ConditionMgr::isConditionTypeValid(Condition* cond)`
`2486`	`2486`	`return false;`
`2487`	`2487`	`}`
`2488`	`2488`	`break;`
`2489`		`- case CONDITION_RANDOM_DUNGEON:`
	`2489`	`+ case CONDITION_PLAYER_QUEUED_RANDOM_DUNGEON:`
`2490`	`2490`	`if (cond->ConditionValue1 > 1)`
`2491`	`2491`	`{`
`2492`	`2492`	`LOG_ERROR("sql.sql", "RandomDungeon condition has useless data in value1 ({}).", cond->ConditionValue1);`