Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
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
This commit is contained in:
Vincent_Michael
2013-02-02 00:16:11 +01:00
parent 0b72a91e76 817f5b3648
commit 6161f69b7e
17 changed files with 260 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/2013_02_01_00_world_gameobject.sql Normal file
View File

@@ -0,0 +1 @@
DELETE FROM `gameobject` WHERE `id`=180184;

12
sql/updates/world/2013_02_01_01_world_spell_loot_template.sql Normal file
View File

@@ -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);

4
sql/updates/world/2013_02_01_02_world_spell_script_names.sql Normal file
View File

@@ -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');