diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-26 02:04:32 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-26 02:04:32 +0200 |
| commit | c57fa8f781d0513dc07881b724bf27a758485a20 (patch) | |
| tree | 3ac7da1d137c2d4df3caf25e5cdf180d9665eaa7 /sql | |
| parent | dc175a2a4c21c7c1380d91777e8890d24e6ab383 (diff) | |
| parent | 34fc72cf71e4d54aece21e21f8b47f3a866fe5b4 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/SpellInfo.h
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_priest.cpp
src/server/scripts/Spells/spell_warlock.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_07_25_00_world_spell_script_names.sql | 22 | ||||
| -rw-r--r-- | sql/updates/world/2013_07_25_01_world_conditions.sql | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/sql/updates/world/2013_07_25_00_world_spell_script_names.sql b/sql/updates/world/2013_07_25_00_world_spell_script_names.sql new file mode 100644 index 00000000000..14e6d16df44 --- /dev/null +++ b/sql/updates/world/2013_07_25_00_world_spell_script_names.sql @@ -0,0 +1,22 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ( +'spell_warl_banish', +'spell_dru_enrage', +'spell_pri_mana_burn', +'spell_pri_guardian_spirit', +'spell_dk_improved_blood_presence', +'spell_dk_improved_frost_presence', +'spell_dk_improved_unholy_presence', +'spell_dk_presence' +); + +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES +(-710, 'spell_warl_banish'), +(5229, 'spell_dru_enrage'), +(8129, 'spell_pri_mana_burn'), +(47788, 'spell_pri_guardian_spirit'), +(-50365,'spell_dk_improved_blood_presence'), +(-50384,'spell_dk_improved_frost_presence'), +(-50391,'spell_dk_improved_unholy_presence'), +(48266, 'spell_dk_presence'), +(48263, 'spell_dk_presence'), +(48265, 'spell_dk_presence'); diff --git a/sql/updates/world/2013_07_25_01_world_conditions.sql b/sql/updates/world/2013_07_25_01_world_conditions.sql new file mode 100644 index 00000000000..1990fe3094b --- /dev/null +++ b/sql/updates/world/2013_07_25_01_world_conditions.sql @@ -0,0 +1,2 @@ +-- Fix gossip condition for Bat Handler Camille <Bat Handler> +UPDATE `conditions` SET `ConditionTypeOrReference`=28 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8894 AND `SourceEntry`=0 AND `ConditionValue1`=11229; |