diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-02 00:16:11 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-02 00:16:11 +0100 |
| commit | 6161f69b7ed2d41c3942e3635f40f10297bdd28b (patch) | |
| tree | 05864c9e6ebe77488072413d453a48e4225dd38b /sql | |
| parent | 0b72a91e7667943dd128ca28f5bb71d8457d3ec9 (diff) | |
| parent | 817f5b36483a6e8fe895ec8c2dc68179b8b450da (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'sql')
3 files changed, 17 insertions, 0 deletions
diff --git a/sql/updates/world/2013_02_01_00_world_gameobject.sql b/sql/updates/world/2013_02_01_00_world_gameobject.sql new file mode 100644 index 00000000000..2476d623c5a --- /dev/null +++ b/sql/updates/world/2013_02_01_00_world_gameobject.sql @@ -0,0 +1 @@ +DELETE FROM `gameobject` WHERE `id`=180184; diff --git a/sql/updates/world/2013_02_01_01_world_spell_loot_template.sql b/sql/updates/world/2013_02_01_01_world_spell_loot_template.sql new file mode 100644 index 00000000000..0185f464412 --- /dev/null +++ b/sql/updates/world/2013_02_01_01_world_spell_loot_template.sql @@ -0,0 +1,12 @@ +-- loot for Prismatic Black Diamond +DELETE FROM `spell_loot_template` WHERE `entry`=62941; +INSERT INTO `spell_loot_template` (`entry`, `item`, `ChanceOrQuestChance`, `lootmode`, `groupid`, `mincountOrRef`, `maxcount`) VALUES +(62941, 23094, 0, 1, 1, 1, 1), +(62941, 23095, 0, 1, 1, 1, 1), +(62941, 28595, 0, 1, 1, 1, 1), +(62941, 23116, 0, 1, 1, 1, 1), +(62941, 23118, 0, 1, 1, 1, 1), +(62941, 23119, 0, 1, 1, 1, 1), +(62941, 23120, 0, 1, 1, 1, 1), +(62941, 23114, 0, 1, 1, 1, 1), +(62941, 23115, 0, 1, 1, 1, 1); diff --git a/sql/updates/world/2013_02_01_02_world_spell_script_names.sql b/sql/updates/world/2013_02_01_02_world_spell_script_names.sql new file mode 100644 index 00000000000..33b7b1fab6e --- /dev/null +++ b/sql/updates/world/2013_02_01_02_world_spell_script_names.sql @@ -0,0 +1,4 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_marrowgar_bone_slice'; +INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES +(69055,'spell_marrowgar_bone_slice'), +(70814,'spell_marrowgar_bone_slice'); |