diff options
| author | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
|---|---|---|
| committer | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
| commit | 98d3cc01d58d9bbdd8b02f1f64bb3432649aa2c2 (patch) | |
| tree | 93b7235de06ffbd4f18ccf58ec62f7e079d7d7f5 /sql | |
| parent | 7b7327acdcbeadc5ec509da4520190205d640f52 (diff) | |
| parent | df334f194c7b0da49fd1c1a4f821df78a0e25fb8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/scripts/world_scripts_full.sql | 5 | ||||
| -rw-r--r-- | sql/updates/2011_01_16_0_world_spell_script_names.sql | 7 | ||||
| -rw-r--r-- | sql/updates/3.3.5a_old/09632_characters_arena_team_member.sql (renamed from sql/updates/3.3.5a_old/09632_character_arena_team_member.sql) | 0 |
3 files changed, 11 insertions, 1 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql index 94b1b296bea..4c7b081d67e 100644 --- a/sql/scripts/world_scripts_full.sql +++ b/sql/scripts/world_scripts_full.sql @@ -1847,7 +1847,10 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES ( 72089, 'spell_marrowgar_bone_spike_graveyard'), ( 69140, 'spell_marrowgar_coldflame'), ( 72705, 'spell_marrowgar_coldflame'), -( 69147, 'spell_marrowgar_coldflame_trigger'), +( 69146, 'spell_marrowgar_coldflame_damage'), +( 70823, 'spell_marrowgar_coldflame_damage'), +( 70824, 'spell_marrowgar_coldflame_damage'), +( 70825, 'spell_marrowgar_coldflame_damage'); ( 69075, 'spell_marrowgar_bone_storm'), ( 70834, 'spell_marrowgar_bone_storm'), ( 70835, 'spell_marrowgar_bone_storm'), diff --git a/sql/updates/2011_01_16_0_world_spell_script_names.sql b/sql/updates/2011_01_16_0_world_spell_script_names.sql new file mode 100644 index 00000000000..2d0c1f28efd --- /dev/null +++ b/sql/updates/2011_01_16_0_world_spell_script_names.sql @@ -0,0 +1,7 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_marrowgar_coldflame_trigger'; +DELETE FROM `spell_script_names` WHERE `spell_id` IN (69146,70823,70824,70825) AND `ScriptName`='spell_marrowgar_coldflame_damage'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69146,'spell_marrowgar_coldflame_damage'), +(70823,'spell_marrowgar_coldflame_damage'), +(70824,'spell_marrowgar_coldflame_damage'), +(70825,'spell_marrowgar_coldflame_damage'); diff --git a/sql/updates/3.3.5a_old/09632_character_arena_team_member.sql b/sql/updates/3.3.5a_old/09632_characters_arena_team_member.sql index cc33ecbb78b..cc33ecbb78b 100644 --- a/sql/updates/3.3.5a_old/09632_character_arena_team_member.sql +++ b/sql/updates/3.3.5a_old/09632_characters_arena_team_member.sql |