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

Fix grammar, explicitly state that we need this check

Browse source
This commit is contained in:
Enerdy 2015-05-02 13:45:40 +01:00
parent f4fa624936
commit ee776b7e60
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

@ -2298,7 +2298,7 @@ namespace TShockAPI
if (TShock.Itembans.ItemIsBanned(itemName, args.Player)) if (TShock.Itembans.ItemIsBanned(itemName, args.Player))
{ {
control[5] = false; 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); 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.Config.BanOnHardcoreDeath)
{ {
if (!TShock.Utils.Ban(args.Player, TShock.Config.HardcoreBanReason, false, "hardcore-death")) 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 else
{ {
@ -2801,7 +2801,7 @@ namespace TShockAPI
if (TShock.Config.BanOnMediumcoreDeath) if (TShock.Config.BanOnMediumcoreDeath)
{ {
if (!TShock.Utils.Ban(args.Player, TShock.Config.MediumcoreBanReason, false, "mediumcore-death")) 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 else
{ {

1
TShockAPI/TShock.cs
View file

@ -871,6 +871,7 @@ namespace TShockAPI
} }
player.IgnoreActionsForCheating = check; player.IgnoreActionsForCheating = check;
check = "none"; 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) foreach (Item item in player.TPlayer.armor)
{ {
if (Itembans.ItemIsBanned(item.name, player)) if (Itembans.ItemIsBanned(item.name, player))