Skip to content

Commit edf9cfa

Browse files
author
Github Actions
committed
Merge 3.3.5 to 3.3.5-vas-autobalance
2 parents ba030ff + 32bfd07 commit edf9cfa

File tree

6 files changed

+1703
-0
lines changed

6 files changed

+1703
-0
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--
2+
UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 2924 WHERE `OptionBroadcastTextID` = 50546 AND `OptionID` = 1;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--
2+
UPDATE `gossip_menu_option` SET `OptionBroadcastTextID` = 2924 WHERE `OptionBroadcastTextID` = 50546;
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- Cast Summon Khadgar's Servant even on mounted player
2+
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_01_01_world.sql

Lines changed: 1687 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
--
2+
DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (64414);
3+
INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
4+
(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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2984,6 +2984,9 @@ void Map::SendInitTransports(Player* player)
29842984
if (*i != player->GetTransport())
29852985
(*i)->BuildCreateUpdateBlockForPlayer(&transData, player);
29862986

2987+
if (!transData.HasData())
2988+
return;
2989+
29872990
WorldPacket packet;
29882991
transData.BuildPacket(&packet);
29892992
player->SendDirectMessage(&packet);
@@ -2997,6 +3000,9 @@ void Map::SendRemoveTransports(Player* player)
29973000
if (*i != player->GetTransport())
29983001
(*i)->BuildOutOfRangeUpdateBlock(&transData);
29993002

3003+
if (!transData.HasData())
3004+
return;
3005+
30003006
WorldPacket packet;
30013007
transData.BuildPacket(&packet);
30023008
player->SendDirectMessage(&packet);

0 commit comments

Comments
 (0)