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

Merge pull request #14613 from ariel-/shathalls

Browse Source 
Fixed some issues with PR #14157
(cherry picked from commit 82a6cbcad4)

Included coverity fix of 25881ca95f (DD)

Conflicts:
	src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
This commit is contained in:
DDuarte
2015-06-01 02:31:32 +01:00
parent a323ee5e62
commit e43a6b373a
7 changed files with 317 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/updates/world/2015_06_01_00_world_2015_05_26_05.sql Normal file
View File

@@ -0,0 +1,3 @@
DELETE FROM `spell_script_names` WHERE `spell_id` = 39291;
INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
(39291, 'spell_remove_kargath_executioner');