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

Merge branch 'hackedinventory' into crp

Browse source
This commit is contained in:
Lucas Nicodemus 2017-12-22 10:22:46 -07:00
commit 0a156c5204
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/TShock.cs
View file

@ -1081,7 +1081,6 @@ namespace TShockAPI
}
else if (!Main.ServerSideCharacter || (Main.ServerSideCharacter && player.IsLoggedIn))
{
string check = "none";
if (!player.HasPermission(Permissions.ignorestackhackdetection))
{
player.IsDisabledForStackDetection = player.HasHackedItemStacks(shouldWarnPlayer: true);
@ -1140,7 +1139,8 @@ namespace TShockAPI
break;
}
}
player.IsDisabledForBannedWearable = true;
if (check != "none")
player.IsDisabledForBannedWearable = true;
if (player.IsBeingDisabled())
{