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

Minor update.

Browse source 
- AssertGroupValid now both sends the message and kicks the player
  depending on input parameter.
- /login and DataHandler code is now an identical assert check.
This commit is contained in:
quake1337 2021-07-13 21:53:54 +02:00
parent 048aaf6f0c
commit c759af6d49
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
View file

@ -825,9 +825,9 @@ namespace TShockAPI
{ {
var group = TShock.Groups.GetGroupByName(account.Group); var group = TShock.Groups.GetGroupByName(account.Group);
if (group == null) if (!TShock.Utils.AssertGroupValid(args.Player, group, false))
{ {
args.Player.SendErrorMessage("Login failed: The account references a group that doesn't exist."); args.Player.SendErrorMessage("Login attempt failed - see the message above.");
return; return;
} }

4
TShockAPI/GetDataHandlers.cs
View file

@ -2452,7 +2452,7 @@ namespace TShockAPI
var group = TShock.Groups.GetGroupByName(account.Group); var group = TShock.Groups.GetGroupByName(account.Group);
if (!TShock.Utils.AssertGroupValid(args.Player, group)) if (!TShock.Utils.AssertGroupValid(args.Player, group, true))
return true; return true;
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID); args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID);
@ -3007,7 +3007,7 @@ namespace TShockAPI
var group = TShock.Groups.GetGroupByName(account.Group); var group = TShock.Groups.GetGroupByName(account.Group);
if (!TShock.Utils.AssertGroupValid(args.Player, group)) if (!TShock.Utils.AssertGroupValid(args.Player, group, true))
return true; return true;
args.Player.Group = group; args.Player.Group = group;

8
TShockAPI/Utils.cs
View file

@ -214,15 +214,19 @@ namespace TShockAPI
/// <summary> /// <summary>
/// Asserts that the group reference can be safely assigned to the player object. /// Asserts that the group reference can be safely assigned to the player object.
/// <para>If this assertion fails, and <paramref name="kick"/> is true, the player is disconnected. If <paramref name="kick"/> is false, the player will receive an error message.</para>
/// </summary> /// </summary>
/// <param name="player"></param> /// <param name="player"></param>
/// <param name="group"></param> /// <param name="group"></param>
/// <returns></returns> /// <returns></returns>
public bool AssertGroupValid(TSPlayer player, Group group) public bool AssertGroupValid(TSPlayer player, Group group, bool kick)
{ {
if (group == null) if (group == null)
{ {
player.Disconnect("Your account's group could not be found. Please contact server administrators about this."); if (kick)
player.Disconnect("Your account's group could not be loaded. Please contact server administrators about this.");
else
player.SendErrorMessage("Your account's group could not be loaded. Please contact server administrators about this.");
return false; return false;
} }