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

Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp

9 files changed, 53 insertions, 2 deletions

diff --git a/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql b/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql
new file mode 100644
index 00000000000..068c9c0a098
--- /dev/null
+++ b/sql/updates/auth/2014_07_09_00_auth_rbac_permission.sql
@@ -0,0 +1,10 @@
+SET @id = 631;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id`=@id;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id, 'Command: reload battleground_template');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=@id;
+INSERT INTO `rbac_linked_permissions` (`id`, `linkedId`) VALUES
+(196, @id);
diff --git a/sql/updates/world/2014_07_08_11_world_misc.sql b/sql/updates/world/2014_07_08_11_world_misc.sql
index cc957b012d2..357d1b6ac94 100644
--- a/sql/updates/world/2014_07_08_11_world_misc.sql
+++ b/sql/updates/world/2014_07_08_11_world_misc.sql
@@ -42,7 +42,7 @@ INSERT INTO `pickpocketing_loot_template` VALUES
 (@SOULEATER, 27854, 8, 1, 0, 1, 1);
 
 -- Pool_template for Eredar Soul Eater Spawns
-DELETE FROM `pool_template` WHERE entry = 1161;
+DELETE FROM `pool_template` WHERE entry = @POOL;
 INSERT INTO `pool_template` (`entry`, `max_limit`, `description`) VALUES
 (@POOL, 2, 'Eredar Soul-Eater');
 
diff --git a/sql/updates/world/2014_07_09_00_world_misc.sql b/sql/updates/world/2014_07_09_00_world_misc.sql
index ddc83353176..4fb7fa99dcc 100644
--- a/sql/updates/world/2014_07_09_00_world_misc.sql
+++ b/sql/updates/world/2014_07_09_00_world_misc.sql
@@ -2,7 +2,7 @@
 SET @SPELL_TRIGGER     := 53435; -- Teleport to CoT Stratholme Phase 4
 SET @SPELL_EFFECT      := 53436; -- Teleport to CoT Stratholme Phase 4
 
-DELETE FROM `gossip_menu_option` WHERE `menu_id` = @MENUID5 or `menu_id` = @MENUID1 and `id` = 2;
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 11277 or `menu_id` = 9586 and `id` = 2;
 INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES
 (9586, 2, 0, 'Chromie, you and I both know what\'s going to happen in this time stream. We\'ve seen this all before. Can you just skip us ahead to all the real action?', 39667, 1, 1, 11277, 0, 0, 0, '', 0),
 (11277, 0, 0, 'Yes, please!', 32024, 1, 1, 0, 0, 0, 0, '', 0);
diff --git a/sql/updates/world/2014_07_09_01_world_creature.sql b/sql/updates/world/2014_07_09_01_world_creature.sql
new file mode 100644
index 00000000000..a66cd896383
--- /dev/null
+++ b/sql/updates/world/2014_07_09_01_world_creature.sql
@@ -0,0 +1 @@
+UPDATE `creature` SET `modelid`=0 WHERE `id`=10262;
diff --git a/sql/updates/world/2014_07_09_02_world_creature_template_addon.sql b/sql/updates/world/2014_07_09_02_world_creature_template_addon.sql
new file mode 100644
index 00000000000..801eb08e306
--- /dev/null
+++ b/sql/updates/world/2014_07_09_02_world_creature_template_addon.sql
@@ -0,0 +1,7 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (SELECT guid FROM `creature` WHERE `id` = 684);
+DELETE FROM `creature_template_addon` WHERE `entry` IN (21337,636,684);
+
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(21337, 0, 0, 131072, 1, 0, '5916 30982'),
+(636,   0, 0, 131072, 1, 0, '6408'),
+(684,   0, 0, 131072, 1, 0, '22766');
diff --git a/sql/updates/world/2014_07_09_03_world_command.sql b/sql/updates/world/2014_07_09_03_world_command.sql
new file mode 100644
index 00000000000..6ffac8a631a
--- /dev/null
+++ b/sql/updates/world/2014_07_09_03_world_command.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name` LIKE 'reload battleground_template';
+INSERT INTO `command` (`name`, `permission`, `help`) VALUES
+('reload battleground_template', 631, 'Syntax: .reload battleground_template\r\nReload Battleground Templates.');
diff --git a/sql/updates/world/2014_07_09_04_world_quest_template.sql b/sql/updates/world/2014_07_09_04_world_quest_template.sql
new file mode 100644
index 00000000000..d9fb0a988a6
--- /dev/null
+++ b/sql/updates/world/2014_07_09_04_world_quest_template.sql
@@ -0,0 +1,12 @@
+--
+UPDATE `quest_template` SET `NextQuestId`=13722 WHERE `Id` =13696;
+UPDATE `quest_template` SET `NextQuestId`=13593 WHERE `Id` =13593;
+-- The below is to fix the alliance chain, horde chain works fine with above 2 changes, but http://www.wowhead.com/quest=13593
+-- Valiant Of Stormwind had `NextQuestIdChain` set to http://www.wowhead.com/quest=13722 The Valiant's Charge which is
+-- Horde (Bloodelf) quest, wowhead says quest is horde but wrongly says it grants stormwind rep too so maybe someone got this wrong
+-- whole chain worked fine for humans but for non-humans chain would break after turning in http://www.wowhead.com/quest=13593 as 
+-- http://www.wowhead.com/quest=13718 would never be offered to non humans once they picked to champion stormwind after doing own faction
+
+-- Basically the non human quest for starting stormwind chain had nextquestchainid pointing to horde quest and thats what
+-- was breaking it for alliance.
+UPDATE `quest_template` SET `NextQuestIdChain`=13718 WHERE  `Id`=13593;
diff --git a/sql/updates/world/2014_07_09_05_world_gameobject_template.sql b/sql/updates/world/2014_07_09_05_world_gameobject_template.sql
new file mode 100644
index 00000000000..497d7a4b42b
--- /dev/null
+++ b/sql/updates/world/2014_07_09_05_world_gameobject_template.sql
@@ -0,0 +1,2 @@
+-- Template updates for gameobject 1721 (Locked ball and chain)
+UPDATE `gameobject_template` SET `flags`=`flags`|4 WHERE `entry`=1721;
diff --git a/sql/updates/world/2014_07_09_06_world_misc.sql b/sql/updates/world/2014_07_09_06_world_misc.sql
new file mode 100644
index 00000000000..add24e16e9b
--- /dev/null
+++ b/sql/updates/world/2014_07_09_06_world_misc.sql
@@ -0,0 +1,16 @@
+--
+UPDATE `creature_template` SET `ainame`='SmartAI' WHERE `entry`=19823;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid`=19823 AND `source_type`=0;
+INSERT INTO `smart_scripts` VALUES
+(19823,0,0,0,6,0,100,0,0,0,0,0,33,22051,0,0,0,0,0,16,0,0,0,0,0,0,0,'Crazed Colossus - On Death - Quest Credit');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceEntry`=19823;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22,1,19823,0,0,1,0,38224,0,0,0,0,0,'','Execute only if invoker has equipped Enchanted Illidari Tabard');
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger`=38224;
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(38224, 38225, 2, 'Illidari Agent Illusion - Illidari Disguise (Male)');
+
+UPDATE `quest_template` SET `NextQuestId`=13718 WHERE `Id` =13593;