summaryrefslogtreecommitdiffstats
path: root/source/Server.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-06-27 17:14:20 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-06-27 17:14:20 +0200
commitbc421842c6a052cbc74d3cc28d5edb263780350f (patch)
treefa41dab729e3fe0cd69c219d3ae130ee686c95c6 /source/Server.cpp
parentAdded a warning when spawning an entity in a non-existent chunk (diff)
downloadcuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.gz
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.bz2
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.lz
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.xz
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.tar.zst
cuberite-bc421842c6a052cbc74d3cc28d5edb263780350f.zip
Diffstat (limited to 'source/Server.cpp')
-rw-r--r--source/Server.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/source/Server.cpp b/source/Server.cpp
index 21fbb97db..7dac3ea18 100644
--- a/source/Server.cpp
+++ b/source/Server.cpp
@@ -174,6 +174,8 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
return false;
}
+ m_RCONServer.Initialize(a_SettingsIni);
+
m_bIsConnected = true;
m_pState->ServerID = "-";
@@ -215,12 +217,13 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
cServer::cServer(void)
: m_pState(new sServerState)
- , m_ListenThreadIPv4(*this, cSocket::IPv4)
- , m_ListenThreadIPv6(*this, cSocket::IPv6)
+ , m_ListenThreadIPv4(*this, cSocket::IPv4, "Client")
+ , m_ListenThreadIPv6(*this, cSocket::IPv6, "Client")
, m_Millisecondsf(0)
, m_Milliseconds(0)
, m_bIsConnected(false)
, m_bRestarting(false)
+ , m_RCONServer(*this)
{
}