Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/shared/Utilities/Util.cpp

16 files changed, 104 insertions, 0 deletions

diff --git a/sql/updates/auth/2014_04_26_00_rbac_permissions.sql b/sql/updates/auth/2014_04_26_00_auth_rbac_permissions.sql
index 11beed8f106..11beed8f106 100644
--- a/sql/updates/auth/2014_04_26_00_rbac_permissions.sql
+++ b/sql/updates/auth/2014_04_26_00_auth_rbac_permissions.sql
diff --git a/sql/updates/auth/2014_04_28_00_rbac_permissions.sql b/sql/updates/auth/2014_04_28_00_auth_rbac_permissions.sql
index 290052764dd..290052764dd 100644
--- a/sql/updates/auth/2014_04_28_00_rbac_permissions.sql
+++ b/sql/updates/auth/2014_04_28_00_auth_rbac_permissions.sql
diff --git a/sql/updates/characters/2014_04_30_00_character_queststatus_seasonal.sql b/sql/updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql
index 0c063b29df0..0c063b29df0 100644
--- a/sql/updates/characters/2014_04_30_00_character_queststatus_seasonal.sql
+++ b/sql/updates/characters/2014_04_30_00_characters_character_queststatus_seasonal.sql
diff --git a/sql/updates/world/2014_06_03_world_creature.sql b/sql/updates/world/2014_06_03_00_world_creature.sql
index 81953785fd5..81953785fd5 100644
--- a/sql/updates/world/2014_06_03_world_creature.sql
+++ b/sql/updates/world/2014_06_03_00_world_creature.sql
diff --git a/sql/updates/world/2014_06_09_00_world_quest_template.sql b/sql/updates/world/2014_06_09_00_world_quest_template.sql
new file mode 100644
index 00000000000..240dd4a75d2
--- /dev/null
+++ b/sql/updates/world/2014_06_09_00_world_quest_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `quest_template` SET `RequestItemsText` = 'What business is it you wish to speak of, $N? You must feel it is important if you continue to pester me.' WHERE `id` = 6522;
+UPDATE `quest_template` SET `OfferRewardText` = 'I recognize the insignia on this scroll, $N. You found this on that crone who reigns over Razorfen Kraul? Interesting.$b$bThe Scourge aren''t content with one continent it seems. This Ambassador Malcin--the one who wrote the note--is one of the Scourge''s plagued servants, a human diplomat to the kingdom of Lordaeron before things... changed.$b$bIf the Scourge are trying to gain a foothold in Kalimdor, then it is up to us to act.' WHERE `id` = 6522;
diff --git a/sql/updates/world/2014_06_11_01_world_spell_script_names.sql b/sql/updates/world/2014_06_11_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..433f1cf8b09
--- /dev/null
+++ b/sql/updates/world/2014_06_11_01_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+--
+DELETE FROM `spell_script_names` WHERE `spell_id` = 50842;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (50842, 'spell_dk_pestilence'); 
diff --git a/sql/updates/world/2014_06_11_02_world_fish_junk_loot_template.sql b/sql/updates/world/2014_06_11_02_world_fish_junk_loot_template.sql
new file mode 100644
index 00000000000..a8dc813d4b2
--- /dev/null
+++ b/sql/updates/world/2014_06_11_02_world_fish_junk_loot_template.sql
@@ -0,0 +1,20 @@
+SET @FISH_JUNK_GROUP := 11799;
+SET @FISH_JUNK_LOOTMODE := 32768;
+
+DELETE FROM fishing_loot_template WHERE `item`=@FISH_JUNK_GROUP;
+INSERT INTO fishing_loot_template (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES
+(1, @FISH_JUNK_GROUP, 100, @FISH_JUNK_LOOTMODE, 1, -@FISH_JUNK_GROUP, 1);
+
+DELETE FROM reference_loot_template WHERE `entry`=@FISH_JUNK_GROUP;
+INSERT INTO reference_loot_template (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES
+(@FISH_JUNK_GROUP, 45190, 15, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Driftwood]
+(@FISH_JUNK_GROUP, 45191, 2, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Water Snail]
+(@FISH_JUNK_GROUP, 45194, 15, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Tangled Fishing Line]
+(@FISH_JUNK_GROUP, 45195, 5, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Empty Rum Bottle]
+(@FISH_JUNK_GROUP, 45196, 15, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Tattered Cloth]
+(@FISH_JUNK_GROUP, 45197, 5, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Tree Branch]
+(@FISH_JUNK_GROUP, 45198, 15, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Weeds]
+(@FISH_JUNK_GROUP, 45199, 5, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Old Boot]
+(@FISH_JUNK_GROUP, 45200, 15, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Sickly Fish]
+(@FISH_JUNK_GROUP, 45201, 3, @FISH_JUNK_LOOTMODE, 1, 1, 1), -- [Rock]
+(@FISH_JUNK_GROUP, 45202, 5, @FISH_JUNK_LOOTMODE, 1, 1, 1); -- [Water Snail]
diff --git a/sql/updates/world/2014_06_12_00_world_quest_template.sql b/sql/updates/world/2014_06_12_00_world_quest_template.sql
new file mode 100644
index 00000000000..333aac99b0b
--- /dev/null
+++ b/sql/updates/world/2014_06_12_00_world_quest_template.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `quest_template` SET `RequestItemsText` = 'By Nozdormu''s teeth!' WHERE `id` = 24428;
+UPDATE `quest_template` SET `OfferRewardText` = 'What? How did you get this? Isn''t she... Never mind the details, I suppose. You''ll be wanting one of these baubles as recompense, no doubt.' WHERE `id` = 24428;
diff --git a/sql/updates/world/2014_06_12_01_world_gossip_menu_option.sql b/sql/updates/world/2014_06_12_01_world_gossip_menu_option.sql
new file mode 100644
index 00000000000..ee423e3eaea
--- /dev/null
+++ b/sql/updates/world/2014_06_12_01_world_gossip_menu_option.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `gossip_menu_option` SET `action_menu_id`=1143 WHERE  `menu_id`=1142 AND `id`=0;
diff --git a/sql/updates/world/2014_06_14_00_world_creature_template.sql b/sql/updates/world/2014_06_14_00_world_creature_template.sql
new file mode 100644
index 00000000000..19a2063571f
--- /dev/null
+++ b/sql/updates/world/2014_06_14_00_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `unit_class`=4,`unit_flags2`=0x10000 WHERE `entry` IN (37672,38285,38605,38786,38787,38788,38789,38790); -- Mutated Abomination
diff --git a/sql/updates/world/2014_06_14_01_world_misc.sql b/sql/updates/world/2014_06_14_01_world_misc.sql
new file mode 100644
index 00000000000..05261164241
--- /dev/null
+++ b/sql/updates/world/2014_06_14_01_world_misc.sql
@@ -0,0 +1,49 @@
+DELETE FROM `gossip_menu_option` WHERE `menu_id`=10389;
+INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `box_coded`, `box_money`, `box_text`) VALUES
+(10389, 0, 0, 'Teleport to the Expedition Base Camp.', 33919, 1, 0, 0, ''), -- 194569
+(10389, 1, 0, 'Teleport to the Formation Grounds.', 33920, 1, 0, 0, ''), -- 194569
+(10389, 3, 0, 'Teleport to the Colossal Forge.', 33921, 1, 0, 0, ''), -- 194569
+(10389, 4, 0, 'Teleport to the Scrapyard.', 33922, 1, 0, 0, ''), -- 194569
+(10389, 5, 0, 'Teleport to the Antechamber of Ulduar.', 33923, 1, 0, 0, ''), -- 194569
+(10389, 6, 0, 'Teleport to the Shattered Walkway.', 33924, 1, 0, 0, ''), -- 194569
+(10389, 10, 0, 'Teleport to the Conservatory of Life.', 33926, 1, 0, 0, ''), -- 194569
+(10389, 12, 0, 'Teleport to the Spark of Imagination.', 33927, 1, 0, 0, ''), -- 194569
+(10389, 15, 0, 'Teleport to the Prison of Yogg-Saron.', 33928, 1, 0, 0, ''); -- 194569
+
+UPDATE `gameobject_template` SET AIName = 'SmartGameObjectAI', `ScriptName` = '' WHERE `entry`=194569;
+
+SET @Entry := 194569;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Entry;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid`=@Script;
+INSERT INTO `smart_scripts` VALUES
+-- Expedition Base Camp Teleport
+(@ENTRY,1,0,9,62,0,100,0,10389,0,0,0,11,64014,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 0 - Cast "Expedition Base Camp Teleport"'),
+-- Formation Grounds Teleport
+(@ENTRY,1,1,9,62,0,100,0,10389,1,0,0,11,64032,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 1 - Cast "Formation Grounds Teleport"'),
+-- Colossal Forge Teleport
+(@ENTRY,1,2,9,62,0,100,0,10389,3,0,0,11,64028,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 3 - Cast "Colossal Forge Teleport"'),
+-- Scrapyard Teleport
+(@ENTRY,1,3,9,62,0,100,0,10389,4,0,0,11,64031,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 4 - Cast "Scrapyard Teleport"'),
+-- Antechamber Teleport
+(@ENTRY,1,4,9,62,0,100,0,10389,5,0,0,11,64030,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 5 - Cast "Antechamber Teleport"'),
+-- Shattered Walkway Teleport
+(@ENTRY,1,5,9,62,0,100,0,10389,6,0,0,11,64029,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 6 - Cast "Shattered Walkway Teleport"'),
+-- Conservatory Teleport
+(@ENTRY,1,6,9,62,0,100,0,10389,10,0,0,11,64024,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 10 - Cast "Conservatory Teleport"'),
+-- Halls of Invention Teleport
+(@ENTRY,1,7,9,62,0,100,0,10389,12,0,0,11,64025,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 12 - Cast "Halls of Invention Teleport"'),
+-- Prison of Yogg-Saron Teleport
+(@ENTRY,1,8,9,62,0,100,0,10389,15,0,0,11,65042,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - On gossip select 15 - Cast "Prison of Yogg-Saron Teleport"'),
+-- Close gossip
+(@ENTRY,1,9,0,61,0,100,0,0,0,0,0,72,0,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ulduar Teleporter - Linked with Previous Event - Close gossip');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10389;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(15, 10389, 1, 0, 0, 13, 1, 20, 2, 0, 0, 0, 0, '', 'Show options for gossip only if 2 Collossus death'),
+(15, 10389, 3, 0, 0, 13, 1, 0, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_LEVIATHAN done'),
+(15, 10389, 4, 0, 0, 13, 1, 3, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_XT002 done'),
+(15, 10389, 5, 0, 0, 13, 1, 3, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_XT002 done'),
+(15, 10389, 6, 0, 0, 13, 1, 5, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_KOLOGARN done'),
+(15, 10389, 12, 0, 0, 13, 1, 5, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_KOLOGARN done'),
+(15, 10389, 10, 0, 0, 13, 1, 6, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_AURIAYA done'),
+(15, 10389, 15, 0, 0, 13, 1, 14, 3, 2, 0, 0, 0, '', 'Show options for gossip only if BOSS_VEZAX done');
diff --git a/sql/updates/world/2014_06_14_02_world_spell_script_names.sql b/sql/updates/world/2014_06_14_02_world_spell_script_names.sql
new file mode 100644
index 00000000000..53b1f2f6286
--- /dev/null
+++ b/sql/updates/world/2014_06_14_02_world_spell_script_names.sql
@@ -0,0 +1,9 @@
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_ulduar_teleporter';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(64014, 'spell_ulduar_teleporter'),
+(64032, 'spell_ulduar_teleporter'),
+(64028, 'spell_ulduar_teleporter'),
+(64030, 'spell_ulduar_teleporter'),
+(64029, 'spell_ulduar_teleporter'),
+(64025, 'spell_ulduar_teleporter'),
+(65042, 'spell_ulduar_teleporter');
diff --git a/sql/updates/world/2014_06_14_03_world_smart_scripts.sql b/sql/updates/world/2014_06_14_03_world_smart_scripts.sql
new file mode 100644
index 00000000000..ffd0ed03963
--- /dev/null
+++ b/sql/updates/world/2014_06_14_03_world_smart_scripts.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=6221 AND `id` IN (9,10);
diff --git a/sql/updates/world/2014_06_14_04_world_trinity_string.sql b/sql/updates/world/2014_06_14_04_world_trinity_string.sql
new file mode 100644
index 00000000000..b110a7de6d2
--- /dev/null
+++ b/sql/updates/world/2014_06_14_04_world_trinity_string.sql
@@ -0,0 +1,3 @@
+DELETE FROM `trinity_string` WHERE `entry`=11009;
+INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES
+(11009, 'Flags Extra: %u');
diff --git a/sql/updates/world/2014_06_15_00_world_spell_script_names.sql b/sql/updates/world/2014_06_15_00_world_spell_script_names.sql
new file mode 100644
index 00000000000..84123740083
--- /dev/null
+++ b/sql/updates/world/2014_06_15_00_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=42005;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(42005, 'spell_gurtogg_bloodboil_bloodboil');
diff --git a/sql/updates/world/2014_06_15_01_world_creature_template.sql b/sql/updates/world/2014_06_15_01_world_creature_template.sql
new file mode 100644
index 00000000000..48358811c94
--- /dev/null
+++ b/sql/updates/world/2014_06_15_01_world_creature_template.sql
@@ -0,0 +1,7 @@
+-- inherit vehicleid and accessory from normal mode npc
+UPDATE `creature_template` SET `VehicleId`=0 WHERE `entry` IN (
+30935, -- Drakkari Rhino (1)
+31749, -- Hover Disk (1)
+31748, -- Hover Disk (1)
+37626  -- Iceborn Proto-Drake (1)
+);