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

2 files changed, 23 insertions, 0 deletions

diff --git a/sql/updates/world/2014_07_19_00_world_creature_misc.sql b/sql/updates/world/2014_07_19_00_world_creature_misc.sql
new file mode 100644
index 00000000000..1f8eba3d33c
--- /dev/null
+++ b/sql/updates/world/2014_07_19_00_world_creature_misc.sql
@@ -0,0 +1,20 @@
+DELETE FROM `creature_addon` WHERE `guid` IN (
+132567,
+132568,
+132566,
+132564,
+132565,
+132553,
+132554,
+132555,
+132556,
+132557,
+132558,
+132559,
+132560,
+132561,
+132562,
+132563);
+DELETE FROM `creature_template_addon` WHERE `entry`=23051;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(23051, 0, 0x0, 0x1, '');
diff --git a/sql/updates/world/2014_07_19_00_world_spell_custom_attr.sql b/sql/updates/world/2014_07_19_00_world_spell_custom_attr.sql
new file mode 100644
index 00000000000..fee4f9cc077
--- /dev/null
+++ b/sql/updates/world/2014_07_19_00_world_spell_custom_attr.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_custom_attr` WHERE `entry`=49882;
+INSERT INTO `spell_custom_attr` (`entry`, `attributes`) VALUES
+(49882, 32768);