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

Ensures Netplay.ServerPassword is always empty.

Browse source 
This prevents an issue in which packets are sent in an unexpected order resulting in clients being unable to connect when a CLI-defined password is used.
A CLI-defined password will now override any TShock config-defined password.
This commit is contained in:
White 2016-12-31 11:33:48 +10:30
parent 36904b673f
commit 4f7a15f9bf
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
TShockAPI/TShock.cs
View file

@ -822,6 +822,7 @@ namespace TShockAPI
/// <summary>AuthToken - The auth token used by the /auth system to grant temporary superadmin access to new admins.</summary> /// <summary>AuthToken - The auth token used by the /auth system to grant temporary superadmin access to new admins.</summary>
public static int AuthToken = -1; public static int AuthToken = -1;
private string _cliPassword = null;
/// <summary>OnPostInit - Fired when the server loads a map, to perform world specific operations.</summary> /// <summary>OnPostInit - Fired when the server loads a map, to perform world specific operations.</summary>
/// <param name="args">args - The EventArgs object.</param> /// <param name="args">args - The EventArgs object.</param>
@ -829,6 +830,16 @@ namespace TShockAPI
{ {
SetConsoleTitle(false); SetConsoleTitle(false);
//This is to prevent a bug where a CLI-defined password causes packets to be
//sent in an unexpected order, resulting in clients being unable to connect
if (!string.IsNullOrEmpty(Netplay.ServerPassword))
{
//CLI defined password overrides a config password
_cliPassword = Netplay.ServerPassword;
Netplay.ServerPassword = "";
Config.ServerPassword = _cliPassword;
}
// Disable the auth system if "auth.lck" is present or a superadmin exists // Disable the auth system if "auth.lck" is present or a superadmin exists
if (File.Exists(Path.Combine(SavePath, "auth.lck")) || Users.GetUsers().Exists(u => u.Group == new SuperAdminGroup().Name)) if (File.Exists(Path.Combine(SavePath, "auth.lck")) || Users.GetUsers().Exists(u => u.Group == new SuperAdminGroup().Name))
{ {
@ -2172,7 +2183,14 @@ namespace TShockAPI
if (file.MaxSlots > 235) if (file.MaxSlots > 235)
file.MaxSlots = 235; file.MaxSlots = 235;
Main.maxNetPlayers = file.MaxSlots + 20; Main.maxNetPlayers = file.MaxSlots + 20;
Netplay.ServerPassword = ""; Netplay.ServerPassword = "";
if (!string.IsNullOrEmpty(_cliPassword))
{
//This prevents a config reload from removing/updating a CLI-defined password
file.ServerPassword = _cliPassword;
}
Netplay.spamCheck = false; Netplay.spamCheck = false;
} }
} }