summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-07-18 09:18:00 +0200
committermadmaxoft <github@xoft.cz>2014-07-18 09:18:11 +0200
commitd52a51f7b6530d2a63682798472840d7261ebad4 (patch)
treeb4fb9c7777959be930f179c6f277f413c4a33ec2
parentMerge pull request #1208 from Howaner/MobInventory (diff)
downloadcuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar.gz
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar.bz2
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar.lz
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar.xz
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.tar.zst
cuberite-d52a51f7b6530d2a63682798472840d7261ebad4.zip
-rw-r--r--src/HTTPServer/HTTPServer.cpp4
-rw-r--r--src/RCONServer.cpp4
-rw-r--r--src/Server.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/HTTPServer/HTTPServer.cpp b/src/HTTPServer/HTTPServer.cpp
index b7edf7829..8eabe5cb2 100644
--- a/src/HTTPServer/HTTPServer.cpp
+++ b/src/HTTPServer/HTTPServer.cpp
@@ -122,8 +122,8 @@ class cDebugCallbacks :
// cHTTPServer:
cHTTPServer::cHTTPServer(void) :
- m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer IPv4"),
- m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer IPv6"),
+ m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer"),
+ m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer"),
m_Callbacks(NULL)
{
}
diff --git a/src/RCONServer.cpp b/src/RCONServer.cpp
index 28cb1e03b..141c67d1b 100644
--- a/src/RCONServer.cpp
+++ b/src/RCONServer.cpp
@@ -78,8 +78,8 @@ protected:
cRCONServer::cRCONServer(cServer & a_Server) :
m_Server(a_Server),
- m_ListenThread4(*this, cSocket::IPv4, "RCON IPv4"),
- m_ListenThread6(*this, cSocket::IPv6, "RCON IPv6")
+ m_ListenThread4(*this, cSocket::IPv4, "RCON"),
+ m_ListenThread6(*this, cSocket::IPv6, "RCON")
{
}
diff --git a/src/Server.cpp b/src/Server.cpp
index bc9644804..10a354a36 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -105,8 +105,8 @@ void cServer::cTickThread::Execute(void)
// cServer:
cServer::cServer(void) :
- m_ListenThreadIPv4(*this, cSocket::IPv4, "Client IPv4"),
- m_ListenThreadIPv6(*this, cSocket::IPv6, "Client IPv6"),
+ m_ListenThreadIPv4(*this, cSocket::IPv4, "Client"),
+ m_ListenThreadIPv6(*this, cSocket::IPv6, "Client"),
m_PlayerCount(0),
m_PlayerCountDiff(0),
m_ClientViewDistance(0),