diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java index 3dd1b3eb..c06a8596 100644 --- a/src/main/java/tconstruct/armor/player/ArmorExtended.java +++ b/src/main/java/tconstruct/armor/player/ArmorExtended.java @@ -241,7 +241,7 @@ public class ArmorExtended implements IInventory public void dropItems () { EntityPlayer player = parent.get(); - player.captureDrops = true; + for (int i = 0; i < 4; ++i) { if (this.inventory[i] != null) @@ -250,7 +250,6 @@ public class ArmorExtended implements IInventory this.inventory[i] = null; } } - player.captureDrops = false; } @Override diff --git a/src/main/java/tconstruct/armor/player/KnapsackInventory.java b/src/main/java/tconstruct/armor/player/KnapsackInventory.java index 52dffab8..68dac02e 100644 --- a/src/main/java/tconstruct/armor/player/KnapsackInventory.java +++ b/src/main/java/tconstruct/armor/player/KnapsackInventory.java @@ -161,7 +161,7 @@ public class KnapsackInventory implements IInventory public void dropItems () { EntityPlayer player = parent.get(); - player.captureDrops = true; + for (int i = 0; i < inventory.length; ++i) { if (this.inventory[i] != null) @@ -170,7 +170,6 @@ public class KnapsackInventory implements IInventory this.inventory[i] = null; } } - player.captureDrops = false; } public void unequipItems () diff --git a/src/main/java/tconstruct/armor/player/TPlayerHandler.java b/src/main/java/tconstruct/armor/player/TPlayerHandler.java index 99104620..afd6bbf9 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/armor/player/TPlayerHandler.java @@ -261,8 +261,20 @@ public class TPlayerHandler else stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel(); + if (evt.entityPlayer.capturedDrops != evt.drops) + { + evt.entityPlayer.capturedDrops.clear(); + } + + evt.entityPlayer.captureDrops = true; stats.armor.dropItems(); stats.knapsack.dropItems(); + evt.entityPlayer.captureDrops = false; + + if (evt.entityPlayer.capturedDrops != evt.drops) + { + evt.drops.addAll(evt.entityPlayer.capturedDrops); + } playerStats.put(evt.entityPlayer.getPersistentID(), stats); }