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

Custom Disconnect Message

Browse Source 
Adds a m_ShutdownMessage option to the settings. When the stop command
is issued, players are kicked with said message before the server shuts
down.
This commit is contained in:
sweetgiorni 2017-01-03 10:57:31 -08:00
parent 45ce828a16
commit 25e4f15488
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Root.cpp
View File

@ -332,6 +332,22 @@ void cRoot::Start(std::unique_ptr<cSettingsRepositoryInterface> a_OverridesRepo)
void cRoot::StopServer()
{
// Kick all players from the server with custom disconnect message
class cPlayerCallback : public cPlayerListCallback
{
AString m_ShutdownMessage;
virtual bool Item(cPlayer * a_Player)
{
a_Player->GetClientHandlePtr()->Kick(m_ShutdownMessage);
return false;
}
public:
cPlayerCallback(AString a_ShutdownMessage) : m_ShutdownMessage(a_ShutdownMessage) {}
}PlayerCallback((m_Server->GetShutdownMessage()));
cRoot::Get()->ForEachPlayer(PlayerCallback);
// What's a better way to do this?
std::this_thread::sleep_for(std::chrono::seconds(1));
m_TerminateEventRaised = true;
m_StopEvent.Set();
m_InputThreadRunFlag.clear();

1
src/Server.cpp
View File

@ -190,6 +190,7 @@ void cServer::PlayerDestroying(const cPlayer * a_Player)
bool cServer::InitServer(cSettingsRepositoryInterface & a_Settings, bool a_ShouldAuth)
{
m_Description = a_Settings.GetValueSet("Server", "Description", "Cuberite - in C++!");
m_ShutdownMessage = a_Settings.GetValueSet("Server", "ShutdownMessage", "Server shutdown");
m_MaxPlayers = a_Settings.GetValueSetI("Server", "MaxPlayers", 100);
m_bIsHardcore = a_Settings.GetValueSetB("Server", "HardcoreEnabled", false);
m_bAllowMultiLogin = a_Settings.GetValueSetB("Server", "AllowMultiLogin", false);

3
src/Server.h
View File

@ -64,6 +64,8 @@ public:
const AString & GetDescription(void) const {return m_Description; }
const AString & GetShutdownMessage(void) const { return m_ShutdownMessage; }
// Player counts:
int GetMaxPlayers(void) const { return m_MaxPlayers; }
int GetNumPlayers(void) const;
@ -204,6 +206,7 @@ private:
cRCONServer m_RCONServer;
AString m_Description;
AString m_ShutdownMessage;
AString m_FaviconData;
int m_MaxPlayers;
bool m_bIsHardcore;