Merge 3.3.5 to 3.3.5-base_patch

Author: Github Actions

sql/updates/world/3.3.5/2024_07_15_00_world.sql

@@ -0,0 +1,14 @@
+-- Forgotten Depths Ambusher
+SET @ENTRY := 30204;
+-- Update auras
+UPDATE `creature_template_addon` SET `auras`='42459 56422' WHERE `entry`=@ENTRY; -- Dual Wield, Nerubian Submerge
+-- Update unit flags
+UPDATE `creature_template` SET `unit_flags`=512 WHERE `entry`=@ENTRY;
+-- Forgotten Depths Ambusher smart ai
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = @ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
+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`, `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 
+(@ENTRY, 0, 0, 1, 54, 0, 100, 1, 0, 0, 0, 0, 28, 56422, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On just summoned - Remove 'Nerubian Submerge' aura (No Repeat)"),
+(@ENTRY, 0, 1, 2, 61, 0, 100, 1, 0, 0, 0, 0, 11, 56418, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On link - Cast spell 'Emerge From Snow' on Self (No Repeat)"),
+(@ENTRY, 0, 2, 0, 61, 0, 100, 1, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 21, 40, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On link - Attack start on closest player (No Repeat)"),
+(@ENTRY, 0, 3, 0, 7, 0, 100, 1, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Forgotten Depths Ambusher - On evade - Despawn instantly (No Repeat)");

sql/updates/world/3.3.5/2024_07_15_01_world.sql

@@ -0,0 +1,2 @@
+-- Add Franklin the Friendly charm immunnity
+UPDATE `creature_template` SET `mechanic_immune_mask`=`mechanic_immune_mask`|1 WHERE `entry`=14529;

src/server/game/DataStores/DBCStores.cpp

@@ -589,11 +589,12 @@ void LoadDBCStores(const std::string& dataPath)
                 if (sInfo->Effect[j] == SPELL_EFFECT_SEND_TAXI)
                     spellPaths.insert(sInfo->EffectMiscValue[j]);
 
-        sTaxiNodesMask.fill(0);
-        sOldContinentsNodesMask.fill(0);
-        sHordeTaxiNodesMask.fill(0);
-        sAllianceTaxiNodesMask.fill(0);
-        sDeathKnightTaxiNodesMask.fill(0);
+        // reinitialize internal storage for globals after loading TaxiNodes.db2
+        sTaxiNodesMask = {};
+        sOldContinentsNodesMask = {};
+        sHordeTaxiNodesMask = {};
+        sAllianceTaxiNodesMask = {};
+        sDeathKnightTaxiNodesMask = {};
         for (TaxiNodesEntry const* node : sTaxiNodesStore)
         {
             TaxiPathSetBySource::const_iterator src_i = sTaxiPathSetBySource.find(node->ID);
@@ -985,3 +986,12 @@ EmotesTextSoundEntry const* FindTextSoundEmoteFor(uint32 emote, uint32 race, uin
     auto itr = sEmotesTextSoundMap.find(EmotesTextSoundKey(emote, race, gender));
     return itr != sEmotesTextSoundMap.end() ? itr->second : nullptr;
 }
+
+TaxiMask::TaxiMask()
+{
+    if (sTaxiNodesStore.GetNumRows())
+    {
+        _data.resize((sTaxiNodesStore.GetNumRows() + (8 * sizeof(uint64) - 1)) / (8 * sizeof(uint64)) * (sizeof(uint64) / sizeof(value_type)), 0);
+        ASSERT((_data.size() % (8 / sizeof(value_type))) == 0, "TaxiMask byte size must be aligned to a multiple of uint64");
+    }
+}

src/server/game/Entities/Player/PlayerTaxi.cpp

@@ -29,7 +29,7 @@ void PlayerTaxi::InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level
     {
         case CLASS_DEATH_KNIGHT:
         {
-            for (uint8 i = 0; i < TaxiMaskSize; ++i)
+            for (std::size_t i = 0; i < m_taximask.size(); ++i)
                 m_taximask[i] |= sOldContinentsNodesMask[i];
             break;
         }
@@ -66,7 +66,7 @@ bool PlayerTaxi::LoadTaxiMask(std::string const& data)
 {
     bool warn = false;
     std::vector<std::string_view> tokens = Trinity::Tokenize(data, ' ', false);
-    for (uint8 index = 0; (index < TaxiMaskSize) && (index < tokens.size()); ++index)
+    for (size_t index = 0; (index < m_taximask.size()) && (index < tokens.size()); ++index)
     {
         if (Optional<uint32> mask = Trinity::StringTo<uint32>(tokens[index]))
         {
@@ -87,15 +87,9 @@ bool PlayerTaxi::LoadTaxiMask(std::string const& data)
 void PlayerTaxi::AppendTaximaskTo(ByteBuffer& data, bool all)
 {
     if (all)
-    {
-        for (uint8 i = 0; i < TaxiMaskSize; ++i)
-            data << uint32(sTaxiNodesMask[i]);              // all existing nodes
-    }
+        data.append(sTaxiNodesMask.data(), sTaxiNodesMask.size());  // all existing nodes
     else
-    {
-        for (uint8 i = 0; i < TaxiMaskSize; ++i)
-            data << uint32(m_taximask[i]);                  // known nodes
-    }
+        data.append(m_taximask.data(), m_taximask.size());          // known nodes
 }
 
 bool PlayerTaxi::LoadTaxiDestinationsFromString(const std::string& values, uint32 team)
@@ -176,8 +170,8 @@ uint32 PlayerTaxi::GetCurrentTaxiPath() const
 
 std::ostringstream& operator<<(std::ostringstream& ss, PlayerTaxi const& taxi)
 {
-    for (uint8 i = 0; i < TaxiMaskSize; ++i)
-        ss << taxi.m_taximask[i] << ' ';
+    for (std::size_t i = 0; i < taxi.m_taximask.size(); ++i)
+        ss << uint32(taxi.m_taximask[i]) << ' ';
     return ss;
 }
 

src/server/game/Entities/Player/PlayerTaxi.h

@@ -30,7 +30,7 @@ struct FactionTemplateEntry;
 class TC_GAME_API PlayerTaxi
 {
     public:
-        PlayerTaxi() : m_flightMasterFactionId(0) { m_taximask.fill(0); }
+        PlayerTaxi() : m_flightMasterFactionId(0) { }
         ~PlayerTaxi() { }
         // Nodes
         void InitTaxiNodesForLevel(uint32 race, uint32 chrClass, uint8 level);

src/server/game/Handlers/GroupHandler.cpp

@@ -911,7 +911,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData)
     recvData >> Guid;
 
     Player* player = ObjectAccessor::FindConnectedPlayer(Guid);
-    if (!player)
+    if (!player || !GetPlayer()->IsInSameRaidWith(player))
     {
         WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
         data << uint8(0);                                   // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related

src/server/game/Maps/MapManager.cpp

@@ -152,10 +152,6 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
     if (player->IsGameMaster())
         return Map::CAN_ENTER;
 
-    //Other requirements
-    if (!player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true))
-        return Map::CANNOT_ENTER_UNSPECIFIED_REASON;
-
     char const* mapName = entry->MapName[player->GetSession()->GetSessionDbcLocale()];
 
     Group* group = player->GetGroup();
@@ -209,6 +205,10 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
             return Map::CANNOT_ENTER_TOO_MANY_INSTANCES;
     }
 
+    //Other requirements
+    if (!player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true))
+        return Map::CANNOT_ENTER_UNSPECIFIED_REASON;
+
     return Map::CAN_ENTER;
 }
 

src/server/shared/DataStores/DBCEnums.h

@@ -19,7 +19,7 @@
 #define DBCENUMS_H
 
 #include "Define.h"
-#include <array>
+#include <vector>
 
 #pragma pack(push, 1)
 
@@ -433,8 +433,25 @@ enum SummonPropFlags
 #define MAX_PET_TALENT_RANK 3                               // use in calculations, expected <= MAX_TALENT_RANK
 #define MAX_TALENT_TABS 3
 
-static constexpr size_t TaxiMaskSize = 14;
-typedef std::array<uint32, TaxiMaskSize> TaxiMask;
+class TaxiMask
+{
+public:
+    using value_type = uint32;
+
+    TaxiMask();
+
+    value_type& operator[](size_t i) { return _data[i]; }
+    value_type const& operator[](size_t i) const { return _data[i]; }
+
+    size_t size() const { return _data.size(); }
+    value_type const* data() const { return _data.data(); }
+
+    decltype(auto) begin() { return _data.begin(); }
+    decltype(auto) end() { return _data.end(); }
+
+private:
+    std::vector<value_type> _data;
+};
 
 enum TotemCategoryType
 {