From 9bf949d1ba36e5ac8c089453b55f8c5cc0df4b8d Mon Sep 17 00:00:00 2001 From: Aokromes Date: Thu, 29 Mar 2018 02:12:23 +0200 Subject: [PATCH] rename files --- sql/updates/world/3.3.5/2018_03_18_00_world_335.sql | 1 - sql/updates/world/3.3.5/2018_03_27_13_world_335.sql | 2 -- ...018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql} | 2 ++ ...018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql} | 2 ++ ...018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql} | 2 ++ ...018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql} | 2 ++ ...018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql} | 2 ++ ...018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql} | 2 ++ ...2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql | 1 + ...018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql} | 2 ++ .../2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql} | 0 .../2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql} | 0 .../2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql} | 0 ...018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql} | 2 ++ .../2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql} | 0 .../2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql} | 0 .../2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql} | 0 .../2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql} | 0 .../2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql} | 0 .../2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql} | 0 ...018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql} | 2 ++ ...018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql} | 2 ++ ...018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql} | 2 ++ ...018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql} | 2 ++ ...018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql} | 2 ++ ...018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql} | 2 ++ ...018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql} | 2 ++ ...018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql} | 2 ++ ...018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql} | 2 ++ ...018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql} | 2 ++ ...2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql | 2 ++ ...018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql} | 2 ++ ...018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql} | 2 ++ ...018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql} | 2 ++ ...018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql} | 2 ++ src/server/game/Battlegrounds/ArenaTeam.cpp | 2 +- src/server/game/Handlers/ItemHandler.cpp | 2 +- 37 files changed, 49 insertions(+), 5 deletions(-) delete mode 100644 sql/updates/world/3.3.5/2018_03_18_00_world_335.sql delete mode 100644 sql/updates/world/3.3.5/2018_03_27_13_world_335.sql rename sql/updates/world/{3.3.5/2018_03_17_00_world_335.sql => 4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_17_01_world_335.sql => 4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_17_02_world_335.sql => 4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_17_03_world_335.sql => 4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_17_04_world_335.sql => 4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_17_05_world_335.sql => 4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql} (98%) create mode 100644 sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql rename sql/updates/world/{3.3.5/2018_03_20_00_world_335.sql => 4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql} (98%) rename sql/updates/world/{3.3.5/2018_03_21_00_world.sql => 4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_21_01_world.sql => 4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_21_02_world.sql => 4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_23_00_world_335.sql => 4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql} (98%) rename sql/updates/world/{3.3.5/2018_03_23_01_world.sql => 4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_23_02_world.sql => 4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_23_03_world.sql => 4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_27_00_world.sql => 4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_27_01_world.sql => 4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_27_02_world.sql => 4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql} (100%) rename sql/updates/world/{3.3.5/2018_03_27_03_world_335.sql => 4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql} (97%) rename sql/updates/world/{3.3.5/2018_03_27_04_world_335.sql => 4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_05_world_335.sql => 4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_06_world_335.sql => 4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_07_world_335.sql => 4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_08_world_335.sql => 4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_09_world_335.sql => 4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_10_world_335.sql => 4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_11_world_335.sql => 4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_12_world_335.sql => 4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql} (99%) create mode 100644 sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql rename sql/updates/world/{3.3.5/2018_03_27_14_world_335.sql => 4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_15_world_335.sql => 4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql} (99%) rename sql/updates/world/{3.3.5/2018_03_27_16_world_335.sql => 4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql} (98%) rename sql/updates/world/{3.3.5/2018_03_28_00_world_335.sql => 4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql} (96%) diff --git a/sql/updates/world/3.3.5/2018_03_18_00_world_335.sql b/sql/updates/world/3.3.5/2018_03_18_00_world_335.sql deleted file mode 100644 index 056ce6cc98..0000000000 --- a/sql/updates/world/3.3.5/2018_03_18_00_world_335.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `spell_group_stack_rules` SET `stack_rule`=3 WHERE `group_id`=1105; diff --git a/sql/updates/world/3.3.5/2018_03_27_13_world_335.sql b/sql/updates/world/3.3.5/2018_03_27_13_world_335.sql deleted file mode 100644 index 54c5d3c735..0000000000 --- a/sql/updates/world/3.3.5/2018_03_27_13_world_335.sql +++ /dev/null @@ -1,2 +0,0 @@ --- Item "Furen's Notes" -UPDATE `item_template` SET `maxcount`=3 WHERE `entry`=6926; diff --git a/sql/updates/world/3.3.5/2018_03_17_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_17_00_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql index 3255b7494f..8bcae4ae74 100644 --- a/sql/updates/world/3.3.5/2018_03_17_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_00_world_from_335_was_2018_03_17_00_world_335.sql @@ -1,3 +1,4 @@ +/* -- Vindicator Vedaar --> Fix Gossip Texts DELETE FROM `gossip_menu` WHERE `MenuID`=7407 AND `TextID` IN (8878,8877); INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES @@ -15,3 +16,4 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry (14,7407,8878,0,0,8,0,9522,0,0,1,0,0,"","Show gossip text 8878 if quest 'Never Again!' is NOT rewarded"), (14,7407,8877,0,0,8,0,9516,0,0,0,0,0,"","Show gossip text 8877 if quest 'Destroy the Legion' is rewarded"), (14,7407,8877,0,0,8,0,9522,0,0,0,0,0,"","Show gossip text 8877 if quest 'Never Again!' is rewarded"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_17_01_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_17_01_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql index f5138b7a15..c2ed44c9d4 100644 --- a/sql/updates/world/3.3.5/2018_03_17_01_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_01_world_from_335_was_2018_03_17_01_world_335.sql @@ -1,3 +1,4 @@ +/* -- -- Summoned Voidwalker DELETE FROM `smart_scripts` WHERE `entryorguid`=5676 AND `source_type`=0 AND `id` IN (2,3); @@ -20,3 +21,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ DELETE FROM `creature_text` WHERE `CreatureID`=5677; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES (5677,0,0,"Interesting... Now this is more than I expected. Delicious...",12,8,100,0,0,0,1991,0,"Summoned Succubus"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_17_02_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_17_02_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql index af18648888..36ae06b123 100644 --- a/sql/updates/world/3.3.5/2018_03_17_02_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_02_world_from_335_was_2018_03_17_02_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "Onu is Meditating" DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=19 AND `SourceEntry`=961; INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES @@ -16,3 +17,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan DELETE FROM `smart_scripts` WHERE `entryorguid`=3616 AND `source_type`=0 AND `id`=1; 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 (3616,0,1,0,20,0,100,0,961,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Onu - On Quest 'Onu is Meditating' Finished - Say Line 3"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_17_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_17_03_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql index 237d5c70e5..e34f233e71 100644 --- a/sql/updates/world/3.3.5/2018_03_17_03_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_03_world_from_335_was_2018_03_17_03_world_335.sql @@ -1,3 +1,4 @@ +/* -- Godrick Farsan DELETE FROM `creature_text` WHERE `CreatureID`=5693; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -30,3 +31,4 @@ DELETE FROM `smart_scripts` WHERE `entryorguid`=5683 AND `source_type`=0; 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 (5683,0,0,0,0,0,100,0,5000,7000,9000,12000,11,12540,0,0,0,0,0,2,0,0,0,0,0,0,0,"Comar Villard - In Combat - Cast 'Gouge'"), (5683,0,1,0,25,0,100,0,0,0,0,0,11,3417,0,0,0,0,0,1,0,0,0,0,0,0,0,"Comar Villard - On Reset - Cast 'Thrash'"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_17_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_17_04_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql index 8efed23aeb..e7602b60d2 100644 --- a/sql/updates/world/3.3.5/2018_03_17_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_04_world_from_335_was_2018_03_17_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- Takar the Seer UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6244; DELETE FROM `smart_scripts` WHERE `entryorguid`=6244 AND `source_type`=0; @@ -50,3 +51,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan (6245,0,0,"So this... this is how it ends, my love...",12,7,100,0,0,0,2316,0,"Anathera"), (6246,0,0,"Anathera!",12,7,100,15,0,0,2313,0,"Latherion"), (6246,1,0,"Anathera... I cannot bear to face the rest of eternity without you by my side... If you are taken from me, then let this be the day I also return to the earth...",12,7,100,0,0,0,2315,0,"Latherion"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_17_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_03_17_05_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql index 51024c932f..62d0da16a3 100644 --- a/sql/updates/world/3.3.5/2018_03_17_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_05_world_from_335_was_2018_03_17_05_world_335.sql @@ -1,2 +1,4 @@ +/* -- Blood Elf rogue quest Greed (ID 9491) UPDATE `quest_offer_reward` SET `RewardText`="This is the ring, is it? Not much to look at, but you know what they say about one elves' trash...$B$BAnd let's not forget your payment. Don't feel shy about spending it right here sweetie!" WHERE `ID`=9491; +*/ diff --git a/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql new file mode 100644 index 0000000000..ac6cff4d14 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_03_29_06_world_from_335_was_2018_03_18_00_world_335.sql @@ -0,0 +1 @@ +-- UPDATE `spell_group_stack_rules` SET `stack_rule`=3 WHERE `group_id`=1105; diff --git a/sql/updates/world/3.3.5/2018_03_20_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_03_20_00_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql index 903eeb4e35..923dc0848b 100644 --- a/sql/updates/world/3.3.5/2018_03_20_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_07_world_from_335_was_2018_03_20_00_world_335.sql @@ -1,4 +1,6 @@ +/* -- quest 'The Shattered Hand (2)' (ID 1858) UPDATE `quest_offer_reward` SET `RewardText`="Hmmm, now this is interesting. You've more than proved your worth with this, $n. I am quite impressed. Consider yourself the newest member of the Shattered Hand. And take this, it will be a great help to you in the future, I think." WHERE `ID`=1858; +*/ diff --git a/sql/updates/world/3.3.5/2018_03_21_00_world.sql b/sql/updates/world/4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_21_00_world.sql rename to sql/updates/world/4.3.4/2018_03_29_08_world_from_335_was_2018_03_21_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_21_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_21_01_world.sql rename to sql/updates/world/4.3.4/2018_03_29_09_world_from_335_was_2018_03_21_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_21_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_21_02_world.sql rename to sql/updates/world/4.3.4/2018_03_29_10_world_from_335_was_2018_03_21_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_23_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_03_23_00_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql index dd5e993c60..dce5449460 100644 --- a/sql/updates/world/3.3.5/2018_03_23_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_11_world_from_335_was_2018_03_23_00_world_335.sql @@ -1,4 +1,6 @@ +/* -- Fix spawn location for undead UPDATE `playercreateinfo` SET `position_x` = 1676.349976, `position_y` = 1677.449951, `position_z` = 121.669998, `orientation` = 2.705260 WHERE `race` = 5 AND `zone`=85; -- Fix spawn location for night elf UPDATE `playercreateinfo` SET `position_x` = 10311.299805, `position_y` = 831.463013, `position_z` = 1326.410034, `orientation` = 5.480334 WHERE `race` = 4 AND `zone`=141; +*/ diff --git a/sql/updates/world/3.3.5/2018_03_23_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_23_01_world.sql rename to sql/updates/world/4.3.4/2018_03_29_12_world_from_335_was_2018_03_23_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_23_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_23_02_world.sql rename to sql/updates/world/4.3.4/2018_03_29_13_world_from_335_was_2018_03_23_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_23_03_world.sql b/sql/updates/world/4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_23_03_world.sql rename to sql/updates/world/4.3.4/2018_03_29_14_world_from_335_was_2018_03_23_03_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_27_00_world.sql b/sql/updates/world/4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_27_00_world.sql rename to sql/updates/world/4.3.4/2018_03_29_15_world_from_335_was_2018_03_27_00_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_27_01_world.sql b/sql/updates/world/4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_27_01_world.sql rename to sql/updates/world/4.3.4/2018_03_29_16_world_from_335_was_2018_03_27_01_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_27_02_world.sql b/sql/updates/world/4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2018_03_27_02_world.sql rename to sql/updates/world/4.3.4/2018_03_29_17_world_from_335_was_2018_03_27_02_world.sql diff --git a/sql/updates/world/3.3.5/2018_03_27_03_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql similarity index 97% rename from sql/updates/world/3.3.5/2018_03_27_03_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql index 3bcc1502e3..e43d7449bd 100644 --- a/sql/updates/world/3.3.5/2018_03_27_03_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_18_world_from_335_was_2018_03_27_03_world_335.sql @@ -1,6 +1,8 @@ +/* -- -- Dreka'Sur --> Add Gossip Text UPDATE `creature_template` SET `gossip_menu_id`=4067 WHERE `entry`=9620; DELETE FROM `gossip_menu` WHERE `MenuID`=4067; INSERT INTO `gossip_menu` (`MenuID`, `TextID`, `VerifiedBuild`) VALUES (4067,4960,0); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_04_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_04_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql index 38ead2080a..f085dd45ad 100644 --- a/sql/updates/world/3.3.5/2018_03_27_04_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_19_world_from_335_was_2018_03_27_04_world_335.sql @@ -1,3 +1,4 @@ +/* -- Henze Faulk DELETE FROM `creature_text` WHERE `CreatureID`=6172 AND `GroupID`=1; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -15,3 +16,4 @@ INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Lan DELETE FROM `smart_scripts` WHERE `entryorguid`=6177 AND `source_type`=0 AND `id`=4; 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 (6177,0,4,0,19,0,100,0,1784,0,0,0,1,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Narm Faulk - On Quest 'The Tome of Divinity (Part 7)' Taken - Say Line 1"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_05_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_05_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql index 3cebb2e2a4..7badf15caf 100644 --- a/sql/updates/world/3.3.5/2018_03_27_05_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_20_world_from_335_was_2018_03_27_05_world_335.sql @@ -1,3 +1,4 @@ +/* -- Yorus Barleybrew DELETE FROM `creature_text` WHERE `CreatureID`=6166; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -15,3 +16,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (616600,9,3,0,0,0,100,0,3500,3500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 1"), (616600,9,4,0,0,0,100,0,3500,3500,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Say Line 1"), (616600,9,5,0,0,0,100,0,3000,3000,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Yorus Barleybrew - On Script - Add Npc Flag Questgiver"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_06_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_06_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql index 86ecd3811d..5dbabe218c 100644 --- a/sql/updates/world/3.3.5/2018_03_27_06_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_21_world_from_335_was_2018_03_27_06_world_335.sql @@ -1,3 +1,4 @@ +/* -- Muren Stormpike DELETE FROM `creature_text` WHERE `CreatureID`=6114; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -7,3 +8,4 @@ UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=6114; DELETE FROM `smart_scripts` WHERE `entryorguid`=6114 AND `source_type`=0; 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 (6114,0,0,0,19,0,100,0,1680,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Muren Stormpike - On Quest 'Tormus Deepforge' Taken - Say Line 0"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_07_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_07_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql index 06ccb5d3a5..61adc40b28 100644 --- a/sql/updates/world/3.3.5/2018_03_27_07_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_22_world_from_335_was_2018_03_27_07_world_335.sql @@ -1,3 +1,4 @@ +/* -- Furen Longbeard DELETE FROM `creature_text` WHERE `CreatureID`=5413; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -34,3 +35,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (5413,2,-8426.26,613.757,95.269,""), (5413,3,-8428.98,607.758,95.1228,""), (5413,4,-8427,600.092,94.706,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_08_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_08_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql index c31dee9c46..f5fa4335f9 100644 --- a/sql/updates/world/3.3.5/2018_03_27_08_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_23_world_from_335_was_2018_03_27_08_world_335.sql @@ -1,3 +1,4 @@ +/* -- Grimand Elmore DELETE FROM `creature_text` WHERE `CreatureID`=1416 AND `GroupID` IN (2,3); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -16,3 +17,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (141601,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,2.286,"Grimand Elmore - On Script - Set Orientation"), (141601,9,6,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Say Line 3"), (141601,9,7,0,0,0,100,0,0,0,0,0,82,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimand Elmore - On Script - Add Npc Flag Questgiver+Gossip"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_09_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_09_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql index 5bd4220ac2..824291f27a 100644 --- a/sql/updates/world/3.3.5/2018_03_27_09_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_24_world_from_335_was_2018_03_27_09_world_335.sql @@ -1,3 +1,4 @@ +/* -- Mathiel DELETE FROM `creature_text` WHERE `CreatureID`=6142 AND `GroupID` IN (2,3); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -16,3 +17,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ (614201,9,5,0,0,0,100,0,1000,1000,0,0,66,0,0,0,0,0,0,8,0,0,0,0,0,0,1.71042,"Mathiel - On Script - Set Orientation"), (614201,9,6,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Say Line 3"), (614201,9,7,0,0,0,100,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Mathiel - On Script - Add Npc Flag Questgiver"); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_10_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_10_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql index e3645e6df1..8ba984d201 100644 --- a/sql/updates/world/3.3.5/2018_03_27_10_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_25_world_from_335_was_2018_03_27_10_world_335.sql @@ -1,3 +1,4 @@ +/* -- Klockmort Spannerspan DELETE FROM `creature_text` WHERE `CreatureID`=6169; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -27,3 +28,4 @@ DELETE FROM `waypoints` WHERE `entry`=6169; INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES (6169,1,-4815,-1250.3,501.915,""), (6169,2,-4812.48,-1250.62,502.014,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_11_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_11_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql index 4974e392fa..9cb692b18c 100644 --- a/sql/updates/world/3.3.5/2018_03_27_11_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_26_world_from_335_was_2018_03_27_11_world_335.sql @@ -1,3 +1,4 @@ +/* -- Tormus Deepforge DELETE FROM `creature_text` WHERE `CreatureID`=6031; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -25,3 +26,4 @@ DELETE FROM `waypoints` WHERE `entry`=6031; INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES (6031,1,-4798.04,-1104.75,499.605,""), (6031,2,-4793.38,-1098.17,498.89,""); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_12_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_12_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql index 9d723ea42a..b3744ce7be 100644 --- a/sql/updates/world/3.3.5/2018_03_27_12_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_27_world_from_335_was_2018_03_27_12_world_335.sql @@ -1,3 +1,4 @@ +/* -- Donova Snowden DELETE FROM `creature_text` WHERE `CreatureID`=9298 AND `GroupID` IN (3,4,5,6,7,8); INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -37,3 +38,4 @@ INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `positi (929801,1,6364.47,-2522.52,527.093,""), (929801,2,6370.08,-2523.34,532.122,""), (929801,3,6395.57,-2536.75,541.548,""); +*/ diff --git a/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql new file mode 100644 index 0000000000..3d478ad5b4 --- /dev/null +++ b/sql/updates/world/4.3.4/2018_03_29_28_world_from_335_was_2018_03_27_13_world_335.sql @@ -0,0 +1,2 @@ +-- Item "Furen's Notes" +-- UPDATE `item_template` SET `maxcount`=3 WHERE `entry`=6926; diff --git a/sql/updates/world/3.3.5/2018_03_27_14_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_14_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql index 1d22bbffe7..f2555512fd 100644 --- a/sql/updates/world/3.3.5/2018_03_27_14_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_29_world_from_335_was_2018_03_27_14_world_335.sql @@ -1,3 +1,4 @@ +/* -- Winna Hazzard DELETE FROM `creature_text` WHERE `CreatureID`=9996; INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES @@ -31,3 +32,4 @@ INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_ -- Fix position and add random movement for Winna's Kitten UPDATE `creature` SET `position_x`=5126.69, `position_y`=-332.264, `position_z`=356.926, `spawndist`=8, `MovementType`=1 WHERE `guid`=39704; +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_15_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql similarity index 99% rename from sql/updates/world/3.3.5/2018_03_27_15_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql index 02e5ee21cd..740c592198 100644 --- a/sql/updates/world/3.3.5/2018_03_27_15_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_30_world_from_335_was_2018_03_27_15_world_335.sql @@ -1,3 +1,4 @@ +/* -- Quest "Bathran's Hair" DELETE FROM `quest_details` WHERE `ID`=1010; INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `EmoteDelay1`, `EmoteDelay2`, `EmoteDelay3`, `EmoteDelay4`, `VerifiedBuild`) VALUES @@ -398,3 +399,4 @@ INSERT INTO `quest_details` (`ID`, `Emote1`, `Emote2`, `Emote3`, `Emote4`, `Emot (2930,5,1,1,6,0,0,0,0,0); UPDATE `quest_request_items` SET `EmoteOnIncomplete`=6, `EmoteOnComplete`=6 WHERE `ID`=2930; UPDATE `quest_offer_reward` SET `Emote1`=4, `Emote2`=2 WHERE `ID`=2930; +*/ diff --git a/sql/updates/world/3.3.5/2018_03_27_16_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql similarity index 98% rename from sql/updates/world/3.3.5/2018_03_27_16_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql index 627ffdc2e5..88478c82fb 100644 --- a/sql/updates/world/3.3.5/2018_03_27_16_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_31_world_from_335_was_2018_03_27_16_world_335.sql @@ -1,5 +1,7 @@ +/* UPDATE `item_template` SET `maxcount`=1 WHERE `entry`=6926; UPDATE `quest_template` SET `AllowableRaces`=8 WHERE `ID`=1703; UPDATE `quest_template` SET `AllowableRaces`=64 WHERE `ID`=1704; UPDATE `quest_template` SET `AllowableRaces`=1|4 WHERE `ID`=1700; UPDATE `quest_template_addon` SET `PrevQuestID`=1782 WHERE `ID` IN (1710, 1705, 1708,1703,1704,1700); +*/ diff --git a/sql/updates/world/3.3.5/2018_03_28_00_world_335.sql b/sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql similarity index 96% rename from sql/updates/world/3.3.5/2018_03_28_00_world_335.sql rename to sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql index 360a49bb7c..f69adf2bba 100644 --- a/sql/updates/world/3.3.5/2018_03_28_00_world_335.sql +++ b/sql/updates/world/4.3.4/2018_03_29_32_world_from_335_was_2018_03_28_00_world_335.sql @@ -1,3 +1,5 @@ +/* -- Kargath Grunt UPDATE `creature_equip_template` SET `ItemID1`=5287 WHERE `CreatureID`=8155; UPDATE `creature_addon` SET `bytes2`=1 WHERE `guid`=6898; +*/ diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index d38b090866..1160fc3143 100644 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -335,7 +335,7 @@ void ArenaTeam::DelMember(ObjectGuid guid, bool cleanDb) { WorldPacket data; playerMember->RemoveBattlegroundQueueId(bgQueue); - sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, nullptr, playerMember->GetBattlegroundQueueIndex(bgQueue), STATUS_NONE, 0, 0, 0, 0); + sBattlegroundMgr->BuildBattlegroundStatusPacket(&data, nullptr, playerMember, playerMember->GetBattlegroundQueueIndex(bgQueue), STATUS_NONE, 0, 0, GetType()); queue.RemovePlayer(playerMember->GetGUID(), true); playerMember->GetSession()->SendPacket(&data); } diff --git a/src/server/game/Handlers/ItemHandler.cpp b/src/server/game/Handlers/ItemHandler.cpp index 92ef9bc3fd..5254c7e134 100644 --- a/src/server/game/Handlers/ItemHandler.cpp +++ b/src/server/game/Handlers/ItemHandler.cpp @@ -359,7 +359,7 @@ void WorldSession::HandleSellItemOpcode(WorldPacket& recvData) if ((creature->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_NO_SELL_VENDOR) != 0) { - _player->SendSellError(SELL_ERR_CANT_SELL_TO_THIS_MERCHANT, creature, itemguid, 0); + _player->SendSellError(SELL_ERR_CANT_SELL_TO_THIS_MERCHANT, creature, itemguid); return; }