diff options
| author | DDuarte <dnpd.dd@gmail.com> | 2015-06-01 02:31:32 +0100 |
|---|---|---|
| committer | DDuarte <dnpd.dd@gmail.com> | 2015-06-01 02:31:32 +0100 |
| commit | e43a6b373a258eb24fc8ea5d5a86c9ad44279cd0 (patch) | |
| tree | e0fc679ab83c2f9e87808a7c8c8e32ead2ace6ff /sql | |
| parent | a323ee5e6252ec1a5b774ca767d0d7932a37bc4d (diff) | |
Merge pull request #14613 from ariel-/shathalls
Fixed some issues with PR #14157
(cherry picked from commit 82a6cbcad4d34e4b20313c17af99b82be6368e3c)
Included coverity fix of 25881ca95fd3c8e6c8aecb93739d1642c7a4d9c8 (DD)
Conflicts:
src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql b/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql new file mode 100644 index 00000000000..d7ef0e17204 --- /dev/null +++ b/sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id` = 39291; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(39291, 'spell_remove_kargath_executioner'); |