Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
This commit is contained in:
Spp
2013-01-16 15:29:41 +01:00
parent 9391d087fd 927062f61f
commit 0e8011657d
30 changed files with 406 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1 @@
DELETE FROM `creature_addon` WHERE guid=49286;

3
sql/updates/world/2013_01_15_06_world_spell_script_names.sql Normal file
View File

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