summaryrefslogtreecommitdiffstats
path: root/src/Server.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-10-20 22:55:07 +0200
commit987f79afdd8945966d0dfa2d52539e005f771590 (patch)
treefa55849604121317e0a565465212032ebe4b79cb /src/Server.cpp
parentUse std::recusive_mutex (diff)
downloadcuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.gz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.bz2
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.lz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.xz
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.tar.zst
cuberite-987f79afdd8945966d0dfa2d52539e005f771590.zip
Diffstat (limited to '')
-rw-r--r--src/Server.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Server.cpp b/src/Server.cpp
index 38e5cebb3..11da36868 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -332,7 +332,7 @@ void cServer::OnConnectionAccepted(cSocket & a_Socket)
LOGERROR("Client \"%s\" cannot be handled, server probably unstable", ClientIP.c_str());
a_Socket.CloseSocket();
delete NewHandle;
- NewHandle = NULL;
+ NewHandle = nullptr;
return;
}
@@ -631,17 +631,17 @@ void cServer::PrintHelp(const AStringVector & a_Split, cCommandOutputCallback &
void cServer::BindBuiltInConsoleCommands(void)
{
cPluginManager * PlgMgr = cPluginManager::Get();
- PlgMgr->BindConsoleCommand("help", NULL, " - Shows the available commands");
- PlgMgr->BindConsoleCommand("reload", NULL, " - Reloads all plugins");
- PlgMgr->BindConsoleCommand("restart", NULL, " - Restarts the server cleanly");
- PlgMgr->BindConsoleCommand("stop", NULL, " - Stops the server cleanly");
- PlgMgr->BindConsoleCommand("chunkstats", NULL, " - Displays detailed chunk memory statistics");
- PlgMgr->BindConsoleCommand("load <pluginname>", NULL, " - Adds and enables the specified plugin");
- PlgMgr->BindConsoleCommand("unload <pluginname>", NULL, " - Disables the specified plugin");
- PlgMgr->BindConsoleCommand("destroyentities", NULL, " - Destroys all entities in all worlds");
+ PlgMgr->BindConsoleCommand("help", nullptr, " - Shows the available commands");
+ PlgMgr->BindConsoleCommand("reload", nullptr, " - Reloads all plugins");
+ PlgMgr->BindConsoleCommand("restart", nullptr, " - Restarts the server cleanly");
+ PlgMgr->BindConsoleCommand("stop", nullptr, " - Stops the server cleanly");
+ PlgMgr->BindConsoleCommand("chunkstats", nullptr, " - Displays detailed chunk memory statistics");
+ PlgMgr->BindConsoleCommand("load <pluginname>", nullptr, " - Adds and enables the specified plugin");
+ PlgMgr->BindConsoleCommand("unload <pluginname>", nullptr, " - Disables the specified plugin");
+ PlgMgr->BindConsoleCommand("destroyentities", nullptr, " - Destroys all entities in all worlds");
#if defined(_MSC_VER) && defined(_DEBUG) && defined(ENABLE_LEAK_FINDER)
- PlgMgr->BindConsoleCommand("dumpmem", NULL, " - Dumps all used memory blocks together with their callstacks into memdump.xml");
+ PlgMgr->BindConsoleCommand("dumpmem", nullptr, " - Dumps all used memory blocks together with their callstacks into memdump.xml");
#endif
}
@@ -710,7 +710,7 @@ void cServer::AuthenticateUser(int a_ClientID, const AString & a_Name, const ASt
cServer::cNotifyWriteThread::cNotifyWriteThread(void) :
super("ClientPacketThread"),
- m_Server(NULL)
+ m_Server(nullptr)
{
}