diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index ce74c8ff..726165e5 100755 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -2298,7 +2298,7 @@ namespace TShockAPI if (TShock.Itembans.ItemIsBanned(itemName, args.Player)) { control[5] = false; - args.Player.Disable("Using banned item ({0})".SFormat(itemName)); + args.Player.Disable("using a banned item ({0})".SFormat(itemName)); args.Player.SendErrorMessage("You cannot use {0} on this server. Your actions are being ignored.", itemName); } @@ -2606,7 +2606,7 @@ namespace TShockAPI if (TShock.Config.BanOnHardcoreDeath) { if (!TShock.Utils.Ban(args.Player, TShock.Config.HardcoreBanReason, false, "hardcore-death")) - TShock.Utils.ForceKick(args.Player, "Death results in a ban, but can't ban you.", true); + TShock.Utils.ForceKick(args.Player, "Death results in a ban, but you are immune to bans.", true); } else { @@ -2801,7 +2801,7 @@ namespace TShockAPI if (TShock.Config.BanOnMediumcoreDeath) { if (!TShock.Utils.Ban(args.Player, TShock.Config.MediumcoreBanReason, false, "mediumcore-death")) - TShock.Utils.ForceKick(args.Player, "Death results in a ban, but can't ban you.", true); + TShock.Utils.ForceKick(args.Player, "Death results in a ban, but you are immune to bans.", true); } else { diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index a04a9f25..a44133be 100755 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -871,6 +871,7 @@ namespace TShockAPI } player.IgnoreActionsForCheating = check; check = "none"; + // Please don't remove this for the time being; without it, players wearing banned equipment will only get debuffed once foreach (Item item in player.TPlayer.armor) { if (Itembans.ItemIsBanned(item.name, player))