Merge 3.3.5-base_patch to 3.3.5-paymaster

Author: Github Actions

sql/updates/world/3.3.5/2026_10_19_00_world.sql

@@ -0,0 +1,7 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_viper_sting';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_warl_drain_mana';
+DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_item_skull_of_impending_doom';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(3034, 'spell_hun_viper_sting'),
+(5138, 'spell_warl_drain_mana'),
+(5024, 'spell_item_skull_of_impending_doom');

src/server/game/AI/ScriptedAI/ScriptedCreature.cpp

@@ -303,7 +303,7 @@ bool ScriptedAI::HealthAbovePct(uint32 pct) const
     return me->HealthAbovePct(pct);
 }
 
-SpellInfo const* ScriptedAI::SelectSpell(Unit* target, uint32 school, uint32 mechanic, SelectTargetType targets, uint32 powerCostMin, uint32 powerCostMax, float rangeMin, float rangeMax, SelectEffect effects)
+SpellInfo const* ScriptedAI::SelectSpell(Unit* target, uint32 school, uint32 mechanic, SelectTargetType targets, float rangeMin, float rangeMax, SelectEffect effects)
 {
     // No target so we can't cast
     if (!target)
@@ -347,17 +347,6 @@ SpellInfo const* ScriptedAI::SelectSpell(Unit* target, uint32 school, uint32 mec
         if (mechanic && tempSpell->Mechanic != mechanic)
             continue;
 
-        // Make sure that the spell uses the requested amount of power
-        if (powerCostMin && tempSpell->ManaCost < powerCostMin)
-            continue;
-
-        if (powerCostMax && tempSpell->ManaCost > powerCostMax)
-            continue;
-
-        // Continue if we don't have the mana to actually cast this spell
-        if (tempSpell->ManaCost > me->GetPower(tempSpell->PowerType))
-            continue;
-
         // Check if the spell meets our range requirements
         if (rangeMin && me->GetSpellMinRangeForTarget(target, tempSpell) < rangeMin)
             continue;

src/server/game/AI/ScriptedAI/ScriptedCreature.h

@@ -222,7 +222,7 @@ struct TC_GAME_API ScriptedAI : public CreatureAI
         bool HealthAbovePct(uint32 pct) const;
 
         // Returns spells that meet the specified criteria from the creatures spell list
-        SpellInfo const* SelectSpell(Unit* target, uint32 school, uint32 mechanic, SelectTargetType targets, uint32 powerCostMin, uint32 powerCostMax, float rangeMin, float rangeMax, SelectEffect effect);
+        SpellInfo const* SelectSpell(Unit* target, uint32 school, uint32 mechanic, SelectTargetType targets, float rangeMin, float rangeMax, SelectEffect effect);
 
         void SetEquipmentSlots(bool loadDefault, int32 mainHand = EQUIP_NO_CHANGE, int32 offHand = EQUIP_NO_CHANGE, int32 ranged = EQUIP_NO_CHANGE);
 

src/server/game/AuctionHouse/AuctionHouseMgr.cpp

@@ -755,7 +755,7 @@ void AuctionHouseObject::BuildListAuctionItems(WorldPacket& data, Player* player
         if (itemSubClass != 0xffffffff && proto->GetSubClass() != itemSubClass)
             continue;
 
-        if (inventoryType != 0xffffffff && proto->GetInventoryType() != inventoryType)
+        if (inventoryType != 0xffffffff && proto->GetInventoryType() != InventoryType(inventoryType))
         {
             // Cloth items can have INVTYPE_CHEST or INVTYPE_ROBE
             if (!(inventoryType == INVTYPE_CHEST && proto->GetInventoryType() == INVTYPE_ROBE))

src/server/game/AuctionHouse/AuctionHouseMgr.h

@@ -124,7 +124,7 @@ class TC_GAME_API AuctionHouseObject
     typedef std::map<uint32, AuctionEntry*> AuctionEntryMap;
     typedef std::unordered_map<ObjectGuid, time_t> PlayerGetAllThrottleMap;
 
-    uint32 Getcount() const { return AuctionsMap.size(); }
+    uint32 Getcount() const { return uint32(AuctionsMap.size()); }
 
     AuctionEntryMap::iterator GetAuctionsBegin() {return AuctionsMap.begin();}
     AuctionEntryMap::iterator GetAuctionsEnd() {return AuctionsMap.end();}

src/server/game/Battlegrounds/Battleground.h

@@ -341,12 +341,12 @@ class TC_GAME_API Battleground
 
         typedef std::map<ObjectGuid, BattlegroundPlayer> BattlegroundPlayerMap;
         BattlegroundPlayerMap const& GetPlayers() const { return m_Players; }
-        uint32 GetPlayersSize() const { return m_Players.size(); }
+        uint32 GetPlayersSize() const { return uint32(m_Players.size()); }
 
         typedef std::map<ObjectGuid, BattlegroundScore*> BattlegroundScoreMap;
-        uint32 GetPlayerScoresSize() const { return PlayerScores.size(); }
+        uint32 GetPlayerScoresSize() const { return uint32(PlayerScores.size()); }
 
-        uint32 GetReviveQueueSize() const { return m_ReviveQueue.size(); }
+        uint32 GetReviveQueueSize() const { return uint32(m_ReviveQueue.size()); }
 
         void AddPlayerToResurrectQueue(ObjectGuid npc_guid, ObjectGuid player_guid);
         void RemovePlayerFromResurrectQueue(ObjectGuid player_guid);

src/server/game/DungeonFinding/LFGMgr.cpp

@@ -50,7 +50,7 @@ LFGDungeonData::LFGDungeonData() : id(0), name(), map(0), type(0), expansion(0),
 }
 
 LFGDungeonData::LFGDungeonData(LFGDungeonEntry const* dbc) : id(dbc->ID), name(dbc->Name[0]), map(dbc->MapID),
-    type(dbc->TypeID), expansion(uint8(dbc->ExpansionLevel)), group(uint8(dbc->GroupID)),
+    type(uint8(dbc->TypeID)), expansion(uint8(dbc->ExpansionLevel)), group(uint8(dbc->GroupID)),
     minlevel({ uint8(dbc->MinLevel), uint8(dbc->MinLevel), uint8(dbc->MinLevel) }),
     maxlevel({ uint8(dbc->MaxLevel), uint8(dbc->MaxLevel), uint8(dbc->MaxLevel) }),
     difficulty(Difficulty(dbc->Difficulty)), seasonal((dbc->Flags & LFG_FLAG_SEASONAL) != 0), x(0.0f), y(0.0f), z(0.0f), o(0.0f)

src/server/game/DungeonFinding/LFGMgr.h

@@ -286,7 +286,7 @@ struct LFGDungeonData
 
     uint32 id;
     std::string name;
-    uint16 map;
+    uint32 map;
     uint8 type;
     uint8 expansion;
     uint8 group;

src/server/game/Entities/Corpse/Corpse.cpp

@@ -81,13 +81,14 @@ bool Corpse::Create(ObjectGuid::LowType guidlow, Player* owner)
     }
 
     Object::_Create(ObjectGuid::Create<HighGuid::Corpse>(guidlow));
-    SetPhaseMask(owner->GetPhaseMask(), false);
 
     SetObjectScale(1.0f);
     SetOwnerGUID(owner->GetGUID());
 
     _cellCoord = Trinity::ComputeCellCoord(GetPositionX(), GetPositionY());
 
+    CopyPhaseFrom(owner);
+
     return true;
 }
 

src/server/game/Entities/Creature/GossipDef.h

@@ -177,15 +177,8 @@ class TC_GAME_API GossipMenu
 
         void AddGossipMenuItemData(uint32 menuItemId, uint32 gossipActionMenuId, uint32 gossipActionPoi);
 
-        uint32 GetMenuItemCount() const
-        {
-            return _menuItems.size();
-        }
-
-        bool Empty() const
-        {
-            return _menuItems.empty();
-        }
+        uint32 GetMenuItemCount() const { return uint32(_menuItems.size()); }
+        bool Empty() const { return _menuItems.empty(); }
 
         GossipMenuItem const* GetItem(uint32 id) const
         {
@@ -232,23 +225,10 @@ class TC_GAME_API QuestMenu
 
         void AddMenuItem(uint32 QuestId, uint8 Icon);
         void ClearMenu();
-
-        uint8 GetMenuItemCount() const
-        {
-            return _questMenuItems.size();
-        }
-
-        bool Empty() const
-        {
-            return _questMenuItems.empty();
-        }
-
+        uint8 GetMenuItemCount() const{ return uint8(_questMenuItems.size()); }
+        bool Empty() const { return _questMenuItems.empty(); }
         bool HasItem(uint32 questId) const;
-
-        QuestMenuItem const& GetItem(uint16 index) const
-        {
-            return _questMenuItems[index];
-        }
+        QuestMenuItem const& GetItem(uint16 index) const { return _questMenuItems[index]; }
 
     private:
         QuestMenuItemList _questMenuItems;