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

Fix merge conflict part 2

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-27 19:09:08 -07:00
parent f74a0f6a70
commit 70c8ef548f
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TShockAPI/Rest/RestManager.cs
View file

@ -1003,7 +1003,6 @@ namespace TShockAPI
var reason = null == args.Parameters["reason"] ? "Banned via web" : args.Parameters["reason"]; var reason = null == args.Parameters["reason"] ? "Banned via web" : args.Parameters["reason"];
TShock.Bans.AddBan(player.IP, player.Name, "", "", reason); TShock.Bans.AddBan(player.IP, player.Name, "", "", reason);
player.Kick(reason, true, false, null, true); player.Kick(reason, true, false, null, true);
TShock.Utils.ForceKick(player, reason, false, true);
return RestResponse("Player " + player.Name + " was banned"); return RestResponse("Player " + player.Name + " was banned");
} }