diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-29 17:11:25 +0200 |
| commit | cb8f159cea6d6895c1412fa74d209a3dc2298c4b (patch) | |
| tree | 56944635f2e06854637f5c689028dcbfd2ede8b5 /sql | |
| parent | a08b52aa197a31b9821f3f9ef425da6365065907 (diff) | |
| parent | 1bb3c4a2b4e3e974f09c0df478245f8daa3a677c (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_priest.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2013_07_29_00_world_drak_tharon_keep.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2013_07_29_01_world_spelldifficulty_dbc.sql | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/sql/updates/world/2013_07_29_00_world_drak_tharon_keep.sql b/sql/updates/world/2013_07_29_00_world_drak_tharon_keep.sql new file mode 100644 index 00000000000..bfcc29c1080 --- /dev/null +++ b/sql/updates/world/2013_07_29_00_world_drak_tharon_keep.sql @@ -0,0 +1,2 @@ +UPDATE `instance_template` SET `script`="instance_drak_tharon_keep" WHERE `map`=600; +UPDATE `creature_template` SET `ScriptName`="boss_king_dred" WHERE `entry`=27483; diff --git a/sql/updates/world/2013_07_29_01_world_spelldifficulty_dbc.sql b/sql/updates/world/2013_07_29_01_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..56764385765 --- /dev/null +++ b/sql/updates/world/2013_07_29_01_world_spelldifficulty_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spelldifficulty_dbc` WHERE `id` = 48849; +INSERT INTO `spelldifficulty_dbc` (`id`, `spellid0`, `spellid1`) VALUES +(48849, 48849, 59422); |