themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #1304 from Simon311/general-devel

Browse source 
Ensure that players can not connect once the server started shutting down
This commit is contained in:
Lucas Nicodemus 2016-10-16 09:14:42 -06:00 • committed by GitHub
commit c2a656b8fb
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
TShockAPI/TShock.cs
View file

@ -72,6 +72,9 @@ namespace TShockAPI
/// </summary> /// </summary>
internal static bool NoRestart; internal static bool NoRestart;
/// <summary>Will be set to true once Utils.StopServer() is called.</summary>
public static bool ShuttingDown;
/// <summary>Players - Contains all TSPlayer objects for accessing TSPlayers currently on the server</summary> /// <summary>Players - Contains all TSPlayer objects for accessing TSPlayers currently on the server</summary>
public static TSPlayer[] Players = new TSPlayer[Main.maxPlayers]; public static TSPlayer[] Players = new TSPlayer[Main.maxPlayers];
/// <summary>Bans - Static reference to the ban manager for accessing bans & related functions.</summary> /// <summary>Bans - Static reference to the ban manager for accessing bans & related functions.</summary>
@ -1200,6 +1203,13 @@ namespace TShockAPI
/// <param name="args">args - The ConnectEventArgs object.</param> /// <param name="args">args - The ConnectEventArgs object.</param>
private void OnConnect(ConnectEventArgs args) private void OnConnect(ConnectEventArgs args)
{ {
if (ShuttingDown)
{
NetMessage.SendData((int)PacketTypes.Disconnect, args.Who, -1, "Server is shutting down...");
args.Handled = true;
return;
}
var player = new TSPlayer(args.Who); var player = new TSPlayer(args.Who);
if (Utils.ActivePlayers() + 1 > Config.MaxSlots + Config.ReservedSlots) if (Utils.ActivePlayers() + 1 > Config.MaxSlots + Config.ReservedSlots)

2
TShockAPI/Utils.cs
View file

@ -538,6 +538,8 @@ namespace TShockAPI
/// <param name="reason">string reason (default: "Server shutting down!")</param> /// <param name="reason">string reason (default: "Server shutting down!")</param>
public void StopServer(bool save = true, string reason = "Server shutting down!") public void StopServer(bool save = true, string reason = "Server shutting down!")
{ {
TShock.ShuttingDown = true;
ForceKickAll(reason); ForceKickAll(reason);
if (save) if (save)
SaveManager.Instance.SaveWorld(); SaveManager.Instance.SaveWorld();