diff --git a/TShockAPI/Bouncer.cs b/TShockAPI/Bouncer.cs index b0b6a427..3f14e977 100644 --- a/TShockAPI/Bouncer.cs +++ b/TShockAPI/Bouncer.cs @@ -83,7 +83,7 @@ namespace TShockAPI if (!args.Player.HasPermission(Permissions.ignorestackhackdetection)) { - args.Player.IsDisabledForStackDetection = args.Player.HasHackedItemStacks(true); + args.Player.IsDisabledForStackDetection = args.Player.HasHackedItemStacks(shouldWarnPlayer: true); } } diff --git a/TShockAPI/TSPlayer.cs b/TShockAPI/TSPlayer.cs index 23e187fb..89bf758c 100644 --- a/TShockAPI/TSPlayer.cs +++ b/TShockAPI/TSPlayer.cs @@ -308,9 +308,9 @@ namespace TShockAPI } /// Checks to see if a player has hacked item stacks in their inventory, and messages them as it checks. - /// If the check should send a message to the player with the results of the check. + /// If the check should send a message to the player with the results of the check. /// True if any stacks don't conform. - public bool HasHackedItemStacks(bool shouldSendMessage = false) + public bool HasHackedItemStacks(bool shouldWarnPlayer = false) { // Iterates through each inventory location a player has. // This section is sub divided into number ranges for what each range of slots corresponds to. @@ -340,7 +340,7 @@ namespace TShockAPI if (inventory[i].stack > item.maxStack || inventory[i].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove item {0} ({1}) and then rejoin.", item.Name, inventory[i].stack); } @@ -360,7 +360,7 @@ namespace TShockAPI if (armor[index].stack > item.maxStack || armor[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove armor {0} ({1}) and then rejoin.", item.Name, armor[index].stack); } @@ -380,7 +380,7 @@ namespace TShockAPI if (dye[index].stack > item.maxStack || dye[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove dye {0} ({1}) and then rejoin.", item.Name, dye[index].stack); } @@ -400,7 +400,7 @@ namespace TShockAPI if (miscEquips[index].stack > item.maxStack || miscEquips[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove item {0} ({1}) and then rejoin.", item.Name, miscEquips[index].stack); } @@ -420,7 +420,7 @@ namespace TShockAPI if (miscDyes[index].stack > item.maxStack || miscDyes[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove item dye {0} ({1}) and then rejoin.", item.Name, miscDyes[index].stack); } @@ -441,7 +441,7 @@ namespace TShockAPI if (piggy[index].stack > item.maxStack || piggy[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove piggy-bank item {0} ({1}) and then rejoin.", item.Name, piggy[index].stack); } @@ -462,7 +462,7 @@ namespace TShockAPI if (safe[index].stack > item.maxStack || safe[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove safe item {0} ({1}) and then rejoin.", item.Name, safe[index].stack); } @@ -482,7 +482,7 @@ namespace TShockAPI if (trash.stack > item.maxStack) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove trash item {0} ({1}) and then rejoin.", item.Name, trash.stack); } @@ -503,7 +503,7 @@ namespace TShockAPI if (forge[index].stack > item.maxStack || forge[index].stack < 0) { check = true; - if (shouldSendMessage) + if (shouldWarnPlayer) { SendErrorMessage("Stack cheat detected. Remove Defender's Forge item {0} ({1}) and then rejoin.", item.Name, forge[index].stack); } diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index d466a22a..f9a61db8 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1098,7 +1098,7 @@ namespace TShockAPI string check = "none"; if (!player.HasPermission(Permissions.ignorestackhackdetection)) { - player.IsDisabledForStackDetection = player.HasHackedItemStacks(true); + player.IsDisabledForStackDetection = player.HasHackedItemStacks(shouldWarnPlayer: true); } check = "none"; // Please don't remove this for the time being; without it, players wearing banned equipment will only get debuffed once