Fixed a Digital Miner oversight, fixed Bins losing NBT data and allow Bins to accept items with varying item damage

This commit is contained in:
Aidan C. Brady committed 2014-08-05 20:58:22 -04:00
1 parent 06c66d5fbe
commit 12215490f0
6 files changed
+89 -37

No files matched your search

@@ -380,7 +380,7 @@ public class BlockBasic extends Block
if(bin.getItemCount() < bin.MAX_STORAGE)
{
if(bin.addTicks == 0)
if(bin.addTicks == 0 && entityplayer.getCurrentEquippedItem() != null)
{
if(entityplayer.getCurrentEquippedItem() != null)
{
@@ -389,7 +389,8 @@ public class BlockBasic extends Block
bin.addTicks = 5;
}
}
else {
else if(bin.addTicks > 0 && bin.getItemCount() > 0)
{
ItemStack[] inv = entityplayer.inventory.mainInventory;
for(int i = 0; i < inv.length; i++)
@@ -403,6 +404,7 @@ public class BlockBasic extends Block
{
ItemStack remain = bin.add(inv[i]);
inv[i] = remain;
bin.addTicks = 5;
}
((EntityPlayerMP)entityplayer).sendContainerAndContentsToPlayer(entityplayer.openContainer, entityplayer.openContainer.getInventory());