flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #2961 from LogicParrot/enforce

Browse Source 
[PhantomWorlds - 4] Prevent server from starting if there's bad world linkage
This commit is contained in:
LogicParrot
2016-02-08 11:57:57 +02:00
parent 8fd2cb5db2 d8861da599
commit ed97946bb9
3 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Root.cpp
View File

@@ -327,6 +327,17 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
void cRoot::StopServer()
{
m_TerminateEventRaised = true;
m_StopEvent.Set();
m_InputThreadRunFlag.clear();
}
void cRoot::LoadGlobalSettings()
{
// Nothing needed yet
@@ -655,9 +666,7 @@ void cRoot::ExecuteConsoleCommand(const AString & a_Cmd, cCommandOutputCallback
// Some commands are built-in:
if (a_Cmd == "stop")
{
m_TerminateEventRaised = true;
m_StopEvent.Set();
m_InputThreadRunFlag.clear();
StopServer();
return;
}
else if (a_Cmd == "restart")