Merge remote-tracking branch 'origin/master' into 4.3.4

2 files changed, 15 insertions, 0 deletions

diff --git a/sql/updates/world/2013_01_28_00_world_gameobject.sql b/sql/updates/world/2013_01_28_00_world_gameobject.sql
new file mode 100644
index 00000000000..3f49d799c62
--- /dev/null
+++ b/sql/updates/world/2013_01_28_00_world_gameobject.sql
@@ -0,0 +1,8 @@
+-- Doors should be closed
+UPDATE `gameobject` SET `state`=1 WHERE `guid` IN (150074, 150073, 150077);
+
+-- Duplicated Gameobject
+DELETE FROM `gameobject` WHERE `guid`=150081;
+
+-- Fix loots
+UPDATE `gameobject_loot_template` SET `ChanceOrQuestChance`=-100 WHERE `entry` IN (27310, 27239);
diff --git a/sql/updates/world/2013_01_29_00_world_gameobject_loot_template.sql b/sql/updates/world/2013_01_29_00_world_gameobject_loot_template.sql
new file mode 100644
index 00000000000..32146fb9ef8
--- /dev/null
+++ b/sql/updates/world/2013_01_29_00_world_gameobject_loot_template.sql
@@ -0,0 +1,7 @@
+DELETE FROM `gameobject_loot_template` WHERE `entry`=24524 AND `item`=52676;
+INSERT INTO `gameobject_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(24524,52676,100,1,0,1,1);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=4 AND `SourceGroup`=24524 AND `SourceEntry`=52676;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(4,24524,52676,0,0,1,0,72221,0,0,0,0,0,'','Loot Cache of the Ley-Guardian only when aura Luck of the Draw applied');