summaryrefslogtreecommitdiffstats
path: root/source/Root.cpp
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-27 23:14:31 +0200
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2013-04-27 23:14:31 +0200
commit384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb (patch)
tree62a6aaa686e9bc0dc00a33ec4e1eef8a83bfb54b /source/Root.cpp
parentFixed a deadlock (diff)
downloadcuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar.gz
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar.bz2
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar.lz
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar.xz
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.tar.zst
cuberite-384e6603c4fa3ad3549f97e2703f04b5ebc5c1fb.zip
Diffstat (limited to '')
-rw-r--r--source/Root.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/source/Root.cpp b/source/Root.cpp
index 1e7f48cc9..c7be00c20 100644
--- a/source/Root.cpp
+++ b/source/Root.cpp
@@ -373,6 +373,16 @@ void cRoot::TickWorlds(float a_Dt)
void cRoot::ExecuteConsoleCommand(const AString & a_Cmd)
{
+ // Some commands are built-in:
+ if (a_Cmd == "stop")
+ {
+ m_bStop = true;
+ }
+ else if (a_Cmd == "restart")
+ {
+ m_bRestart = true;
+ }
+
// Put the command into a queue (Alleviates FS #363):
cCSLock Lock(m_CSPendingCommands);
m_PendingCommands.push_back(a_Cmd);
@@ -386,16 +396,6 @@ void cRoot::DoExecuteConsoleCommand(const AString & a_Cmd)
{
LOG("Executing console command: \"%s\"", a_Cmd.c_str());
m_Server->ExecuteConsoleCommand(a_Cmd);
-
- // Some commands are built-in:
- if (a_Cmd == "stop")
- {
- m_bStop = true;
- }
- else if (a_Cmd == "restart")
- {
- m_bRestart = true;
- }
}