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

Merge pull request #805 from atom0s/general-devel

Browse source 
Some misc changes for player purposes.
This commit is contained in:
Zack 2014-06-06 21:15:01 -04:00
commit d01c22add2
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/TShock.cs
View file

@ -807,10 +807,12 @@ namespace TShockAPI
string check = "none"; string check = "none";
foreach (Item item in player.TPlayer.inventory) foreach (Item item in player.TPlayer.inventory)
{ {
if (!player.Group.HasPermission(Permissions.ignorestackhackdetection) && item.stack > item.maxStack && if (!player.Group.HasPermission(Permissions.ignorestackhackdetection) && (item.stack > item.maxStack || item.stack < 0) &&
item.type != 0) item.type != 0)
{ {
check = "Remove item " + item.name + " (" + item.stack + ") exceeds max stack of " + item.maxStack; check = "Remove item " + item.name + " (" + item.stack + ") exceeds max stack of " + item.maxStack;
player.SendErrorMessage(check);
break;
} }
} }
player.IgnoreActionsForCheating = check; player.IgnoreActionsForCheating = check;
@ -822,6 +824,9 @@ namespace TShockAPI
player.SetBuff(30, 120); //Bleeding player.SetBuff(30, 120); //Bleeding
player.SetBuff(36, 120); //Broken Armor player.SetBuff(36, 120); //Broken Armor
check = "Remove armor/accessory " + item.name; check = "Remove armor/accessory " + item.name;
player.SendErrorMessage(string.Format("You are wearing banned equipment. {0}", check));
break;
} }
} }
player.IgnoreActionsForDisabledArmor = check; player.IgnoreActionsForDisabledArmor = check;