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

/login kick -> error, add XML doc to Utils method.

Browse source
This commit is contained in:
quake1337 2021-07-13 21:47:27 +02:00
parent 6154ee60c1
commit 048aaf6f0c
2 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Commands.cs
View file

@ -825,8 +825,11 @@ namespace TShockAPI
{ {
var group = TShock.Groups.GetGroupByName(account.Group); var group = TShock.Groups.GetGroupByName(account.Group);
if (!TShock.Utils.AssertGroupValid(args.Player, group)) if (group == null)
{
args.Player.SendErrorMessage("Login failed: The account references a group that doesn't exist.");
return; return;
}
args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID); args.Player.PlayerData = TShock.CharacterDB.GetPlayerData(args.Player, account.ID);

6
TShockAPI/Utils.cs
View file

@ -212,6 +212,12 @@ namespace TShockAPI
} while (TilePlacementValid(tileX, tileY) && TileSolid(tileX, tileY)); } while (TilePlacementValid(tileX, tileY) && TileSolid(tileX, tileY));
} }
/// <summary>
/// Asserts that the group reference can be safely assigned to the player object.
/// </summary>
/// <param name="player"></param>
/// <param name="group"></param>
/// <returns></returns>
public bool AssertGroupValid(TSPlayer player, Group group) public bool AssertGroupValid(TSPlayer player, Group group)
{ {
if (group == null) if (group == null)