Merge 3.3.5 to 3.3.5-skip-dk

sql/updates/world/3.3.5/2024_10_29_00_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 2924 WHERE `OptionBroadcastTextID` = 50546 AND `OptionID` = 1;

sql/updates/world/3.3.5/2024_10_29_01_world.sql

@@ -0,0 +1,2 @@
+--
+UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 2924 WHERE `OptionBroadcastTextID` = 50546;

sql/updates/world/3.3.5/2024_11_01_00_world.sql

@@ -0,0 +1,2 @@
+-- Cast Summon Khadgar's Servant even on mounted player
+UPDATE `smart_scripts` SET `action_param2`=2 WHERE `entryorguid`=1816600 AND `source_type`=9 AND `id`=1;

sql/updates/world/3.3.5/2024_11_03_00_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (64414);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,64414,0,0,31,0,3,33109,0,0,0,0,'','Load Into Catapult target Salvaged Demolisher');

src/server/game/Maps/Map.cpp

@@ -2983,6 +2983,9 @@ void Map::SendInitTransports(Player* player)
         if (*i != player->GetTransport())
             (*i)->BuildCreateUpdateBlockForPlayer(&transData, player);
 
+    if (!transData.HasData())
+        return;
+
     WorldPacket packet;
     transData.BuildPacket(&packet);
     player->SendDirectMessage(&packet);
@@ -2996,6 +2999,9 @@ void Map::SendRemoveTransports(Player* player)
         if (*i != player->GetTransport())
             (*i)->BuildOutOfRangeUpdateBlock(&transData);
 
+    if (!transData.HasData())
+        return;
+
     WorldPacket packet;
     transData.BuildPacket(&packet);
     player->SendDirectMessage(&packet);