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 branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
This commit is contained in:
Vincent-Michael
2014-07-20 03:06:03 +02:00
parent abe8dd7abf 0531f52008
commit e68d3b0937
71 changed files with 1036 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/authserver/Main.cpp
View File

@@ -101,9 +101,9 @@ int main(int argc, char** argv)
return 1;
// Get the list of realms for the server
sRealmList.Initialize(_ioService, sConfigMgr->GetIntDefault("RealmsStateUpdateDelay", 20));
sRealmList->Initialize(_ioService, sConfigMgr->GetIntDefault("RealmsStateUpdateDelay", 20));
if (sRealmList.size() == 0)
if (sRealmList->size() == 0)
{
TC_LOG_ERROR("server.authserver", "No valid realms specified.");
return 1;