diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-24 19:32:13 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2014-01-24 19:36:32 +0100 |
| commit | a5ade26fa0b1771d7adaf8c3ca8631421e8f670b (patch) | |
| tree | 7f8b4e3add4b7f323ae8aa869ccd2c5ca3af069e /sql | |
| parent | b61bf8f01f6ec9298df6b94eb31cadbde72c4b57 (diff) | |
| parent | 9531073b7787ae65140b436395411194b43fd4ed (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Spells/spell_rogue.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2014_01_23_14_world_creature_template.sql | 4 | ||||
| -rw-r--r-- | sql/updates/world/2014_01_23_15_world_spell_script_names.sql | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/sql/updates/world/2014_01_23_14_world_creature_template.sql b/sql/updates/world/2014_01_23_14_world_creature_template.sql new file mode 100644 index 00000000000..05ce8f568fc --- /dev/null +++ b/sql/updates/world/2014_01_23_14_world_creature_template.sql @@ -0,0 +1,4 @@ +-- +UPDATE `creature_template` SET `faction_A`=64, `faction_H`=64 WHERE `entry` IN (39675, 39368, 39386, 39678, 39396, 39275, 39349); +UPDATE `creature_template` SET `faction_A`=875, `faction_H`=875 WHERE `entry` IN (39717, 39716, 39715); +UPDATE `creature_template` SET `faction_A`=59, `faction_H`=59 WHERE `entry`=1117; diff --git a/sql/updates/world/2014_01_23_15_world_spell_script_names.sql b/sql/updates/world/2014_01_23_15_world_spell_script_names.sql new file mode 100644 index 00000000000..f3812f60e2c --- /dev/null +++ b/sql/updates/world/2014_01_23_15_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=51690; +INSERT INTO `spell_script_names` (`spell_id` ,`ScriptName`) VALUES +(51690, 'spell_rog_killing_spree'); |