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

Merge remote-tracking branch 'origin/general-devel' into oop

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-27 19:03:03 -07:00
commit f74a0f6a70
9 changed files with 13 additions and 202 deletions
Download patch file Download diff file Expand all files Collapse all files

5
TShockAPI/Rest/RestManager.cs
View file

@ -624,7 +624,7 @@ namespace TShockAPI
try
{
TShock.Bans.AddBan2(ip, name, "", "", args.Parameters["reason"], true, args.TokenData.Username);
TShock.Bans.AddBan(ip, name, "", "", args.Parameters["reason"], true, args.TokenData.Username);
}
catch (Exception e)
{
@ -1001,8 +1001,9 @@ namespace TShockAPI
TSPlayer player = (TSPlayer)ret;
var reason = null == args.Parameters["reason"] ? "Banned via web" : args.Parameters["reason"];
TShock.Bans.AddBan2(player.IP, player.Name, "", "", reason);
TShock.Bans.AddBan(player.IP, player.Name, "", "", reason);
player.Kick(reason, true, false, null, true);
TShock.Utils.ForceKick(player, reason, false, true);
return RestResponse("Player " + player.Name + " was banned");
}