Add safeguard against drops not being the same as capturedrops. Moved…

… capturing of drops out of armor and knapsack stuff.
SlimeKnights · Oct 5, 2014 · 312fd47 · 312fd47
1 parent 03755be
commit 312fd47
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/armor/player/ArmorExtended.java b/src/main/java/tconstruct/armor/player/ArmorExtended.java
@@ -241,7 +241,7 @@ public void readFromNBT (NBTTagCompound tagCompound)
     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 void dropItems ()
                 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
@@ -161,7 +161,7 @@ public void readFromNBT (NBTTagCompound tagCompound)
     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 void dropItems ()
                 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
@@ -261,8 +261,20 @@ public void playerDrops (PlayerDropsEvent evt)
         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);
     }