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

Replace TSPlayer.IgnoreActionsForDisabledArmor -> boolean

Browse source 
TSPlayer.IgnoreActionsForBannedArmor was useless because it only
stored the last armor/dye a player had. Replaced with a boolean.
This commit is contained in:
Lucas Nicodemus 2017-12-20 17:26:06 -07:00
parent 7efcfd055f
commit 4e186e7375
5 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Bouncer.cs
View file

@ -847,15 +847,15 @@ namespace TShockAPI
if (distance > TShock.Config.MaxRangeForDisabled) if (distance > TShock.Config.MaxRangeForDisabled)
{ {
// We need to tell them they were disabled and why, then revert the change. // We need to tell them they were disabled and why, then revert the change.
if (args.Player.IsDisabledForStackDetection == true) if (args.Player.IsDisabledForStackDetection)
{ {
args.Player.SendErrorMessage("Disabled. You went too far with hacked item stacks."); args.Player.SendErrorMessage("Disabled. You went too far with hacked item stacks.");
} }
else if (args.Player.IgnoreActionsForDisabledArmor != "none") else if (args.Player.IsDisabledForBannedWearable)
{ {
args.Player.SendErrorMessage("Disabled for banned armor: " + args.Player.IgnoreActionsForDisabledArmor); args.Player.SendErrorMessage("Disabled. You went too far with banned armor.");
} }
else if (args.Player.IsDisabledForSSC == true) else if (args.Player.IsDisabledForSSC)
{ {
args.Player.SendErrorMessage("Disabled. You need to {0}login, since server side characters is enabled.", TShock.Config.CommandSpecifier); args.Player.SendErrorMessage("Disabled. You need to {0}login, since server side characters is enabled.", TShock.Config.CommandSpecifier);
} }

2
TShockAPI/Commands.cs
View file

@ -865,7 +865,7 @@ namespace TShockAPI
args.Player.IsDisabledForStackDetection = false; args.Player.IsDisabledForStackDetection = false;
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully."); args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully.");

4
TShockAPI/GetDataHandlers.cs
View file

@ -1801,7 +1801,7 @@ namespace TShockAPI
args.Player.IsDisabledForStackDetection = false; args.Player.IsDisabledForStackDetection = false;
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully."); args.Player.SendSuccessMessage("Authenticated as " + account.Name + " successfully.");
TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + "."); TShock.Log.ConsoleInfo(args.Player.Name + " authenticated successfully as user " + args.Player.Name + ".");
@ -1873,7 +1873,7 @@ namespace TShockAPI
args.Player.IsDisabledForStackDetection = false; args.Player.IsDisabledForStackDetection = false;
if (args.Player.HasPermission(Permissions.usebanneditem)) if (args.Player.HasPermission(Permissions.usebanneditem))
args.Player.IgnoreActionsForDisabledArmor = "none"; args.Player.IsDisabledForBannedWearable = false;
args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen); args.Player.SendMessage("Authenticated as " + args.Player.Name + " successfully.", Color.LimeGreen);

5
TShockAPI/TSPlayer.cs
View file

@ -283,7 +283,8 @@ namespace TShockAPI
/// <summary>Determines if the player is disabled by Bouncer for having hacked item stacks.</summary> /// <summary>Determines if the player is disabled by Bouncer for having hacked item stacks.</summary>
public bool IsDisabledForStackDetection = false; public bool IsDisabledForStackDetection = false;
public string IgnoreActionsForDisabledArmor = "none"; /// <summary>Determines if the player is disabled by the item bans system for having banned wearables on the server.</summary>
public bool IsDisabledForBannedWearable = false;
public bool IgnoreActionsForClearingTrashCan; public bool IgnoreActionsForClearingTrashCan;
@ -299,7 +300,7 @@ namespace TShockAPI
/// <returns>bool - True if any ignore is not none, false, or login state differs from the required state.</returns> /// <returns>bool - True if any ignore is not none, false, or login state differs from the required state.</returns>
public bool CheckIgnores() public bool CheckIgnores()
{ {
return IsDisabledForSSC || IsDisabledForStackDetection || IgnoreActionsForDisabledArmor != "none" || IgnoreActionsForClearingTrashCan || !IsLoggedIn && TShock.Config.RequireLogin; return IsDisabledForSSC || IsDisabledForStackDetection || IsDisabledForBannedWearable || IgnoreActionsForClearingTrashCan || !IsLoggedIn && TShock.Config.RequireLogin;
} }
/// <summary> /// <summary>

2
TShockAPI/TShock.cs
View file

@ -1161,7 +1161,7 @@ namespace TShockAPI
break; break;
} }
} }
player.IgnoreActionsForDisabledArmor = check; player.IsDisabledForBannedWearable = true;
if (player.CheckIgnores()) if (player.CheckIgnores())
{ {