Merge TrinityCore 3.3.5 to ElunaTrinityWotlk [skip ci]

ElunaLuaEngine · Oct 30, 2024 · c56abf1 · c56abf1
2 parents 4676ea6 + 6180393
commit c56abf1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/sql/updates/world/3.3.5/2024_10_29_00_world.sql b/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;
diff --git a/sql/updates/world/3.3.5/2024_10_29_01_world.sql b/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;
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
@@ -3002,6 +3002,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);
@@ -3015,6 +3018,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);