mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-19 19:59:55 +00:00
Merge pull request #1003 from Qowyn/knapsack-fix
Fix trying to doublespawn knapsack inventory and extended armor inventory on death.
This commit is contained in:
commit
2024846420
3 files changed
+10
-8
No files matched your search
@@ -238,18 +238,19 @@ public class ArmorExtended implements IInventory
|
||||
}
|
||||
}
|
||||
|
||||
public void dropItems (ArrayList<EntityItem> drops)
|
||||
public void dropItems ()
|
||||
{
|
||||
EntityPlayer player = parent.get();
|
||||
player.captureDrops = true;
|
||||
for (int i = 0; i < 4; ++i)
|
||||
{
|
||||
if (this.inventory[i] != null)
|
||||
{
|
||||
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
|
||||
drops.add(entityItem);
|
||||
player.func_146097_a(this.inventory[i], true, false);
|
||||
this.inventory[i] = null;
|
||||
}
|
||||
}
|
||||
player.captureDrops = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -158,18 +158,19 @@ public class KnapsackInventory implements IInventory
|
||||
}
|
||||
}
|
||||
|
||||
public void dropItems (ArrayList<EntityItem> drops)
|
||||
public void dropItems ()
|
||||
{
|
||||
EntityPlayer player = parent.get();
|
||||
player.captureDrops = true;
|
||||
for (int i = 0; i < inventory.length; ++i)
|
||||
{
|
||||
if (this.inventory[i] != null)
|
||||
{
|
||||
EntityItem entityItem = player.func_146097_a(this.inventory[i], true, false);
|
||||
drops.add(entityItem);
|
||||
player.func_146097_a(this.inventory[i], true, false);
|
||||
this.inventory[i] = null;
|
||||
}
|
||||
}
|
||||
player.captureDrops = false;
|
||||
}
|
||||
|
||||
public void unequipItems ()
|
||||
|
||||
@@ -261,8 +261,8 @@ public class TPlayerHandler
|
||||
else
|
||||
stats.hunger = evt.entityPlayer.getFoodStats().getFoodLevel();
|
||||
|
||||
stats.armor.dropItems(evt.drops);
|
||||
stats.knapsack.dropItems(evt.drops);
|
||||
stats.armor.dropItems();
|
||||
stats.knapsack.dropItems();
|
||||
|
||||
playerStats.put(evt.entityPlayer.getPersistentID(), stats);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user