diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-05-25 21:52:27 +0200 |
| commit | 15efe08a60d3ccb277dde03abc6cce562ad0b44b (patch) | |
| tree | 9c2a48c3e55a000205ed0f3159d0684f29a0d994 /sql | |
| parent | 49a17c6282fac3d2636e3db740b1a6960fb387ba (diff) | |
| parent | c06dc7d37aa8c795ff505550a7bc388d2a66ecac (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Item/Item.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Server/Protocol/Opcodes.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/SpellEffects.cpp
src/server/game/Weather/Weather.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp
src/server/scripts/Spells/spell_hunter.cpp
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/updates/world/2014_05_23_00_world_spell_script_names.sql | 3 | ||||
| -rw-r--r-- | sql/updates/world/2014_05_23_01_world_trinity_string.sql | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sql/updates/world/2014_05_23_00_world_spell_script_names.sql b/sql/updates/world/2014_05_23_00_world_spell_script_names.sql new file mode 100644 index 00000000000..22d792e6f72 --- /dev/null +++ b/sql/updates/world/2014_05_23_00_world_spell_script_names.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_script_names` WHERE `spell_id`=69232; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69232,'spell_tyrannus_rimefang_icy_blast'); diff --git a/sql/updates/world/2014_05_23_01_world_trinity_string.sql b/sql/updates/world/2014_05_23_01_world_trinity_string.sql new file mode 100644 index 00000000000..e05d36f601c --- /dev/null +++ b/sql/updates/world/2014_05_23_01_world_trinity_string.sql @@ -0,0 +1,3 @@ +DELETE FROM `trinity_string` WHERE `entry`=11008; +INSERT INTO `trinity_string` (`entry`, `content_default`) VALUES +(11008, 'InhabitType: %u'); |