aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormegamage <none@none>2009-01-27 14:54:54 -0600
committermegamage <none@none>2009-01-27 14:54:54 -0600
commit94f0a02f66a26727860047a614c6b92f20ca62ae (patch)
tree7950e1366456ca8b037ae22eca05a4d64a31259e /sql
parenta8c836f8d953fc442a2d07f2d1fd0c9a4d177617 (diff)
parented6337550e8655e24ed078bbc288f7ac2b448f77 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/965_world_scripts.sql2
-rw-r--r--sql/updates/973_world_scripts.sql1
-rw-r--r--sql/updates/CMakeLists.txt1
3 files changed, 3 insertions, 1 deletions
diff --git a/sql/updates/965_world_scripts.sql b/sql/updates/965_world_scripts.sql
index 8f141c9290f..9c93f78ec09 100644
--- a/sql/updates/965_world_scripts.sql
+++ b/sql/updates/965_world_scripts.sql
@@ -1,4 +1,4 @@
-INSERT INTO `spell_script_target` VALUES
+REPLACE INTO `spell_script_target` VALUES
(33655,0,183350),
(33655,0,183351),
(44374,1,24722),
diff --git a/sql/updates/973_world_scripts.sql b/sql/updates/973_world_scripts.sql
new file mode 100644
index 00000000000..42b970aaed6
--- /dev/null
+++ b/sql/updates/973_world_scripts.sql
@@ -0,0 +1 @@
+update creature_template set scriptname = 'npc_enraged_spirit' where entry in (21050, 21061, 21060, 21059); \ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index c92e30e023e..c7b09fe3251 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -161,4 +161,5 @@ INSTALL(FILES
965_world_scripts.sql
966_world_scripts.sql
970_world_scripts.sql
+973_world_scripts.sql
DESTINATION share/trinity/sql/updates)