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

Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4

Browse Source 
Conflicts:
	sql/updates/world/2015_03_01_00_world.sql
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
This commit is contained in:
Carbenium
2015-07-21 23:20:40 +02:00
parent e68de2bc0a 999a5ffa64
commit 67d616c195
26 changed files with 219 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Scripting/ScriptLoader.cpp
View File

@@ -437,7 +437,8 @@ void AddSC_boss_heigan();
void AddSC_boss_gothik();
void AddSC_boss_thaddius();
void AddSC_instance_naxxramas();
void AddSC_boss_magus_telestra(); //The Nexus Nexus
void AddSC_boss_nexus_commanders(); // The Nexus Nexus
void AddSC_boss_magus_telestra();
void AddSC_boss_anomalus();
void AddSC_boss_ormorok();
void AddSC_boss_keristrasza();
@@ -1289,7 +1290,8 @@ void AddNorthrendScripts()
AddSC_boss_gothik();
AddSC_boss_thaddius();
AddSC_instance_naxxramas();
AddSC_boss_magus_telestra(); //The Nexus Nexus
AddSC_boss_nexus_commanders(); // The Nexus Nexus
AddSC_boss_magus_telestra();
AddSC_boss_anomalus();
AddSC_boss_ormorok();
AddSC_boss_keristrasza();