aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authormegamage <none@none>2009-05-17 16:40:40 -0500
committermegamage <none@none>2009-05-17 16:40:40 -0500
commit1c134f81e38137bbfb1c6925a3a42d9628571d4c (patch)
tree479972a69d9badeffab98d51e8c19178afb99ec1 /sql
parentb95e67375c00e7e24609450178c4f7ba44064441 (diff)
parent7c6757d7ee652c8e688caa5c6856d116c1f034c1 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/3373_world_spell.sql2
-rw-r--r--sql/world_spell_full.sql6
2 files changed, 2 insertions, 6 deletions
diff --git a/sql/updates/3373_world_spell.sql b/sql/updates/3373_world_spell.sql
new file mode 100644
index 00000000000..23fe9bac842
--- /dev/null
+++ b/sql/updates/3373_world_spell.sql
@@ -0,0 +1,2 @@
+DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (38528);
+DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
diff --git a/sql/world_spell_full.sql b/sql/world_spell_full.sql
index 1f5b9c8d14f..94b3be8c855 100644
--- a/sql/world_spell_full.sql
+++ b/sql/world_spell_full.sql
@@ -104,10 +104,6 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comm
( 40604, 40616, 1, 'Fel Rage Aura'),
( 40616, 41625, 1, 'Fel Rage Aura'),
( 41292, 42017, 2, 'Aura of Suffering'),
--- hyjal mount
-( 38528,-31984, 2, 'Protection of Elune - Finger of Death'),
-( 38528,-32111, 2, 'Protection of Elune - Finger of Death'),
-( 38528,-32124, 2, 'Protection of Elune - Denouement Wisp'),
-- sunwell
( 44869, 44866, 1, 'Spectral Blast Portal'),
# (44869, 46648, 1, 'Spectral Blast Visual'), cause severe lag seems should be casted by go
@@ -920,7 +916,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
(31394, 32, 0, 0, 0, 0, 0, 0, 0, 0, 0),
(31569, 0, 3, 65536, 0, 0, 0, 0, 0, 0, 0),
(31570, 0, 3, 65536, 0, 0, 0, 0, 0, 0, 0),
-(31785, 0, 0, 0, 0, 0, 34816, 0, 0, 0, 0),
(31794, 0, 0, 0, 0, 0, 0, 65536, 0, 0, 0),
(31801, 0, 0, 0, 0, 0, 0, 0, 20, 0, 0),
(31833, 0, 10, 2147483648, 0, 0, 0, 0, 0, 0, 0),
@@ -974,7 +969,6 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
(33746, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10),
(33757, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3),
(33759, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10),
-(33776, 0, 0, 0, 0, 0, 34816, 0, 0, 0, 0),
(33881, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0),
(33882, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0),
(33883, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0),