aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormegamage <none@none>2009-02-24 21:16:05 -0600
committermegamage <none@none>2009-02-24 21:16:05 -0600
commit98b8e2eeb6b62bcc27412a172d9c52a6e2a16bed (patch)
tree84becae2101eaa7233e3cfacb57ad1840865effe /sql
parent5fda4992661583d7b3cf26ff50dc1b3d8ceedf26 (diff)
parent091d54ae04e34f5b9141bf10fde870c92e2c89ad (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/1558_world_spell_linked_spell.sql5
-rw-r--r--sql/updates/CMakeLists.txt1
-rw-r--r--sql/world_spell_full.sql4
3 files changed, 9 insertions, 1 deletions
diff --git a/sql/updates/1558_world_spell_linked_spell.sql b/sql/updates/1558_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..667d1c998cc
--- /dev/null
+++ b/sql/updates/1558_world_spell_linked_spell.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = '44869' AND `spell_effect` = '-45018';
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = '46019' AND `spell_effect` = '-45018';
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(44869, -45018, 1, 'Remove Arcane Buffet'),
+(46019, -45018, 1, 'Remove Arcane Buffet'); \ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index a9c343b7353..f54e3161cf5 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -43,4 +43,5 @@ INSTALL(FILES
1484_mangos_7307_01_characters_arena_team_member.sql
1495_mangos_7312_01_world_trinity_string.sql
1497_mangos_7314_01_characters_guild_rank.sql
+1558_world_spell_linked_spell.sql
DESTINATION share/trinity/sql/updates) \ No newline at end of file
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index cfaa310a166..0f7a2bd619e 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -74,7 +74,9 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
(45342, 45348, 1, 'Apply Flame Touched'),
(46771, 45348, 1, 'Apply Flame Touched'),
(45271, 45347, 1, 'Apply Dark Touched'),
-(45246, 45348, 1, 'Apply Flame Touched');
+(45246, 45348, 1, 'Apply Flame Touched'),
+(44869, -45018, 1, 'Remove Arcane Buffet'),
+(46019, -45018, 1, 'Remove Arcane Buffet');
-- --------