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

Merge branch 'mintaka' of https://github.com/NyxStudios/TShock into mintaka

Browse source
This commit is contained in:
Enerdy 2016-12-11 23:44:44 +00:00
commit c73003fc67
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/PlayerData.cs
View file

@ -180,7 +180,7 @@ namespace TShockAPI
{
//179-219
var index = i - (NetItem.InventorySlots + NetItem.ArmorSlots + NetItem.DyeSlots
+ NetItem.MiscEquipSlots + NetItem.MiscDyeSlots + NetItem.PiggySlots + NetItem.ForgeSlots);
+ NetItem.MiscEquipSlots + NetItem.MiscDyeSlots + NetItem.PiggySlots);
this.inventory[i] = (NetItem)forge[index];
}
else
@ -464,4 +464,4 @@ namespace TShockAPI
NetMessage.SendData(39, player.Index, -1, "", 400);
}
}
}
}