Fix merge conflict part 2

This commit is contained in:
Lucas Nicodemus 2017-12-27 19:09:08 -07:00
parent f74a0f6a70
commit 70c8ef548f

View file

@ -1003,7 +1003,6 @@ namespace TShockAPI
var reason = null == args.Parameters["reason"] ? "Banned via web" : args.Parameters["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");
}