aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorVincent_Michael <Vincent_Michael@gmx.de>2013-01-16 23:43:07 +0100
committerVincent_Michael <Vincent_Michael@gmx.de>2013-01-16 23:43:07 +0100
commit224b4480a70c4896d67e2f2907620b550e585057 (patch)
tree6241ec784a2594c10d51ebb5a010667a1d0bf00e /sql
parent11bd11badcb730304efa9f850c925dd426f756fd (diff)
parenta8652baaa437cca3eced2d533c0dde3ca3184d1b (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/world/2013_01_15_05_world_creature_addon.sql1
-rw-r--r--sql/updates/world/2013_01_15_06_world_spell_script_names.sql3
-rw-r--r--sql/updates/world/2013_01_16_00_world_gossip_menu.sql4
3 files changed, 8 insertions, 0 deletions
diff --git a/sql/updates/world/2013_01_15_05_world_creature_addon.sql b/sql/updates/world/2013_01_15_05_world_creature_addon.sql
new file mode 100644
index 00000000000..94782891ca1
--- /dev/null
+++ b/sql/updates/world/2013_01_15_05_world_creature_addon.sql
@@ -0,0 +1 @@
+DELETE FROM `creature_addon` WHERE guid=49286;
diff --git a/sql/updates/world/2013_01_15_06_world_spell_script_names.sql b/sql/updates/world/2013_01_15_06_world_spell_script_names.sql
new file mode 100644
index 00000000000..0e327bdc63d
--- /dev/null
+++ b/sql/updates/world/2013_01_15_06_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=24314;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(24314, 'spell_threatening_gaze');
diff --git a/sql/updates/world/2013_01_16_00_world_gossip_menu.sql b/sql/updates/world/2013_01_16_00_world_gossip_menu.sql
new file mode 100644
index 00000000000..1b0554931fa
--- /dev/null
+++ b/sql/updates/world/2013_01_16_00_world_gossip_menu.sql
@@ -0,0 +1,4 @@
+-- Add some missing go gossip
+DELETE FROM `gossip_menu` WHERE `entry` IN (6448,6449,6450,6451);
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES
+(6448,7669),(6449,7670),(6450,7673),(6451,7674);