Core/Networking: ported missing socket related changes from master branch
This commit is contained in:
1 parent
52c56bdef9
commit
44892168c1
11 files changed
+238
-174
No files matched your search
@@ -481,7 +481,7 @@ bool World::RemoveQueuedPlayer(WorldSession* sess)
|
||||
if (*iter == sess)
|
||||
{
|
||||
sess->SetInQueue(false);
|
||||
sess->ResetTimeOutTime();
|
||||
sess->ResetTimeOutTime(false);
|
||||
iter = m_QueuedPlayer.erase(iter);
|
||||
found = true; // removing queued session
|
||||
break;
|
||||
@@ -798,7 +798,10 @@ void World::LoadConfigSettings(bool reload)
|
||||
m_int_configs[CONFIG_PORT_INSTANCE] = sConfigMgr->GetIntDefault("InstanceServerPort", 8086);
|
||||
}
|
||||
|
||||
m_int_configs[CONFIG_SOCKET_TIMEOUTTIME] = sConfigMgr->GetIntDefault("SocketTimeOutTime", 900000);
|
||||
// Config values are in "milliseconds" but we handle SocketTimeOut only as "seconds" so divide by 1000
|
||||
m_int_configs[CONFIG_SOCKET_TIMEOUTTIME] = sConfigMgr->GetIntDefault("SocketTimeOutTime", 900000) / 1000;
|
||||
m_int_configs[CONFIG_SOCKET_TIMEOUTTIME_ACTIVE] = sConfigMgr->GetIntDefault("SocketTimeOutTimeActive", 60000) / 1000;
|
||||
|
||||
m_int_configs[CONFIG_SESSION_ADD_DELAY] = sConfigMgr->GetIntDefault("SessionAddDelay", 10000);
|
||||
|
||||
m_float_configs[CONFIG_GROUP_XP_DISTANCE] = sConfigMgr->GetFloatDefault("MaxGroupXPDistance", 74.0f);
|
||||
|
||||
@@ -225,6 +225,7 @@ enum WorldIntConfigs : uint8
|
||||
CONFIG_PORT_WORLD,
|
||||
CONFIG_PORT_INSTANCE,
|
||||
CONFIG_SOCKET_TIMEOUTTIME,
|
||||
CONFIG_SOCKET_TIMEOUTTIME_ACTIVE,
|
||||
CONFIG_SESSION_ADD_DELAY,
|
||||
CONFIG_GAME_TYPE,
|
||||
CONFIG_REALM_ZONE,
|
||||
|
||||
Reference in new issue
Block a user