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

More SSC cleanup.

Browse source
This commit is contained in:
DogooFalchion 2016-12-21 20:43:09 -05:00
parent 2236a5bb56
commit 95c5129fa9
1 changed files with 36 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

83
TShockAPI/TShock.cs
View file

@ -1951,6 +1951,7 @@ namespace TShockAPI
/// <returns>bool - True if the player has a hacked inventory.</returns> /// <returns>bool - True if the player has a hacked inventory.</returns>
public static bool HackedInventory(TSPlayer player) public static bool HackedInventory(TSPlayer player)
{ {
//TODO: Update this to the new logic in PlayerData.
bool check = false; bool check = false;
Item[] inventory = player.TPlayer.inventory; Item[] inventory = player.TPlayer.inventory;
@ -1962,10 +1963,9 @@ namespace TShockAPI
Item[] safe = player.TPlayer.bank2.item; Item[] safe = player.TPlayer.bank2.item;
Item[] forge = player.TPlayer.bank3.item; Item[] forge = player.TPlayer.bank3.item;
Item trash = player.TPlayer.trashItem; Item trash = player.TPlayer.trashItem;
for (int i = 0; i < NetItem.MaxInventory; i++) for (int i = 0; i < NetItem.MaxInventory; i++)
{ {
if (i < NetItem.InventorySlots) if (i < NetItem.InventoryIndex.Item2)
{ {
//0-58 //0-58
Item item = new Item(); Item item = new Item();
@ -1983,11 +1983,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < NetItem.InventorySlots + NetItem.ArmorSlots) else if (i < NetItem.ArmorIndex.Item2)
{ {
//59-78 //59-78
var index = i - NetItem.ArmorIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - NetItem.InventorySlots;
if (armor[index] != null && armor[index].netID != 0) if (armor[index] != null && armor[index].netID != 0)
{ {
item.netDefaults(armor[index].netID); item.netDefaults(armor[index].netID);
@ -2002,11 +2002,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots) else if (i < NetItem.DyeIndex.Item2)
{ {
//79-88 //79-88
var index = i - NetItem.DyeIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots);
if (dye[index] != null && dye[index].netID != 0) if (dye[index] != null && dye[index].netID != 0)
{ {
item.netDefaults(dye[index].netID); item.netDefaults(dye[index].netID);
@ -2021,12 +2021,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < else if (i < NetItem.MiscEquipIndex.Item2)
NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots + NetItem.MiscEquipSlots)
{ {
//89-93 //89-93
var index = i - NetItem.MiscEquipIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots);
if (miscEquips[index] != null && miscEquips[index].netID != 0) if (miscEquips[index] != null && miscEquips[index].netID != 0)
{ {
item.netDefaults(miscEquips[index].netID); item.netDefaults(miscEquips[index].netID);
@ -2041,14 +2040,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < else if (i < NetItem.MiscDyeIndex.Item2)
NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots + NetItem.MiscEquipSlots
+ NetItem.MiscDyeSlots)
{ {
//93-98 //93-98
var index = i - NetItem.MiscDyeIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots
+ NetItem.MiscEquipSlots);
if (miscDyes[index] != null && miscDyes[index].netID != 0) if (miscDyes[index] != null && miscDyes[index].netID != 0)
{ {
item.netDefaults(miscDyes[index].netID); item.netDefaults(miscDyes[index].netID);
@ -2063,14 +2059,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < else if (i < NetItem.PiggyIndex.Item2)
NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots + NetItem.MiscEquipSlots +
NetItem.MiscDyeSlots + NetItem.PiggySlots)
{ {
//98-138 //98-138
var index = i - NetItem.PiggyIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots
+ NetItem.MiscEquipSlots + NetItem.MiscDyeSlots);
if (piggy[index] != null && piggy[index].netID != 0) if (piggy[index] != null && piggy[index].netID != 0)
{ {
item.netDefaults(piggy[index].netID); item.netDefaults(piggy[index].netID);
@ -2086,14 +2079,11 @@ namespace TShockAPI
} }
} }
} }
else if (i < else if (i < NetItem.SafeIndex.Item2)
NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots + NetItem.MiscEquipSlots +
NetItem.MiscDyeSlots + NetItem.PiggySlots + NetItem.SafeSlots)
{ {
//138-178 //138-178
var index = i - NetItem.SafeIndex.Item1;
Item item = new Item(); Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots
+ NetItem.MiscEquipSlots + NetItem.MiscDyeSlots + NetItem.PiggySlots);
if (safe[index] != null && safe[index].netID != 0) if (safe[index] != null && safe[index].netID != 0)
{ {
item.netDefaults(safe[index].netID); item.netDefaults(safe[index].netID);
@ -2109,31 +2099,9 @@ namespace TShockAPI
} }
} }
} }
else if (i < else if (i < NetItem.TrashIndex.Item2)
NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots + NetItem.MiscEquipSlots +
NetItem.MiscDyeSlots + NetItem.PiggySlots + NetItem.SafeSlots + NetItem.ForgeSlots)
{ {
//179-219 //179-219
Item item = new Item();
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots
+ NetItem.MiscEquipSlots + NetItem.MiscDyeSlots + NetItem.PiggySlots + NetItem.SafeSlots);
if (forge[index] != null && forge[index].netID != 0)
{
item.netDefaults(forge[index].netID);
item.Prefix(forge[index].prefix);
item.AffixName();
if (forge[index].stack > item.maxStack)
{
check = true;
player.SendMessage(
String.Format("Stack cheat detected. Remove Defender's Forge item {0} ({1}) and then rejoin", item.name, forge[index].stack),
Color.Cyan);
}
}
}
else
{
Item item = new Item(); Item item = new Item();
if (trash != null && trash.netID != 0) if (trash != null && trash.netID != 0)
{ {
@ -2150,6 +2118,27 @@ namespace TShockAPI
} }
} }
} }
else
{
//220
var index = i - NetItem.ForgeIndex.Item1;
Item item = new Item();
if (forge[index] != null && forge[index].netID != 0)
{
item.netDefaults(forge[index].netID);
item.Prefix(forge[index].prefix);
item.AffixName();
if (forge[index].stack > item.maxStack)
{
check = true;
player.SendMessage(
String.Format("Stack cheat detected. Remove Defender's Forge item {0} ({1}) and then rejoin", item.name, forge[index].stack),
Color.Cyan);
}
}
}
} }
return check; return check;