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

2 files changed, 6 insertions, 0 deletions

diff --git a/sql/updates/world/2012_08_27_00_creature_template.sql b/sql/updates/world/2012_08_27_00_creature_template.sql
new file mode 100644
index 00000000000..804d7b5c61d
--- /dev/null
+++ b/sql/updates/world/2012_08_27_00_creature_template.sql
@@ -0,0 +1,2 @@
+-- NPC script linking for Wyrmrest Defender ID: 27629
+UPDATE `creature_template` SET `ScriptName`='npc_wyrmrest_defender' WHERE `entry`=27629;
diff --git a/sql/updates/world/2012_08_27_00_world_spell_script_name.sql b/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
new file mode 100644
index 00000000000..1d036df0a65
--- /dev/null
+++ b/sql/updates/world/2012_08_27_00_world_spell_script_name.sql
@@ -0,0 +1,4 @@
+-- Spell script name linking for Defending Wyrmrest Temple: Character Script Cast From Gossip ID: 49123
+DELETE FROM `spell_script_names` WHERE `spell_id`=49213;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(49213,'spell_q12372_cast_from_gossip_trigger');