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

Remove Utils.ForceKick; use TSPlayer.Kick.

Browse source 
Some anti-cheat calls were changed to "You have been Bounced." I don't
think we need to tell clients why they were disconnected so they can
tune their hacks better.
This commit is contained in:
Lucas Nicodemus 2017-12-27 18:01:53 -07:00
parent 9e91db9ea4
commit 1ea04ffd4f
6 changed files with 28 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockAPI/TShock.cs
View file

@ -481,13 +481,13 @@ namespace TShockAPI
// And then get rid of them.
if (potentialBan.Expiration == "")
{
Utils.ForceKick(args.Player, String.Format("Permanently banned by {0} for {1}", potentialBan.BanningUser
,potentialBan.Reason), false, false);
args.Player.Kick(String.Format("Permanently banned by {0} for {1}", potentialBan.BanningUser
,potentialBan.Reason), true, true);
}
else
{
Utils.ForceKick(args.Player, String.Format("Still banned by {0} for {1}", potentialBan.BanningUser,
potentialBan.Reason), false, false);
args.Player.Kick(String.Format("Still banned by {0} for {1}", potentialBan.BanningUser,
potentialBan.Reason), true, true);
}
}
}
@ -1245,14 +1245,14 @@ namespace TShockAPI
if (TShock.Players.Length + 1 > Config.MaxSlots + Config.ReservedSlots)
{
Utils.ForceKick(player, Config.ServerFullNoReservedReason, true, false);
player.Kick(Config.ServerFullNoReservedReason, true, true, null, false);
args.Handled = true;
return;
}
if (!FileTools.OnWhitelist(player.IP))
{
Utils.ForceKick(player, Config.WhitelistKickReason, true, false);
player.Kick(Config.WhitelistKickReason, true, true, null, false);
args.Handled = true;
return;
}
@ -1265,7 +1265,7 @@ namespace TShockAPI
{
if (Config.KickProxyUsers)
{
Utils.ForceKick(player, "Proxies are not allowed.", true, false);
player.Kick("Connecting via a proxy is not allowed.", true, true, null, false);
args.Handled = true;
return;
}
@ -1287,7 +1287,7 @@ namespace TShockAPI
if (Config.KickEmptyUUID && String.IsNullOrWhiteSpace(player.UUID))
{
Utils.ForceKick(player, "Your client did not send a UUID, this server is not configured to accept such a client.", true);
player.Kick("Your client sent a blank UUID. Configure it to send one or use a different client.", true, true, null, false);
args.Handled = true;
return;
}