Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 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 committed 2014-07-20 03:06:03 +02:00
2 parents abe8dd7abf 0531f52008
commit e68d3b0937
71 files changed
+1036 -499
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/server/authserver/Main.cpp
+2 -2
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;