From 07c339c0016d8a066d2bc17829f63413f73e5461 Mon Sep 17 00:00:00 2001 From: blue42u Date: Wed, 30 Apr 2014 08:25:38 -0500 Subject: [PATCH] Fix the extended armor inventory being lost sometimes... And maybe a little cleanup in ArmorExtended... --- .../tconstruct/util/player/ArmorExtended.java | 10 +++++----- .../tconstruct/util/player/TPlayerHandler.java | 2 +- .../tconstruct/util/player/TPlayerStats.java | 17 +++++++++++++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/util/player/ArmorExtended.java b/src/main/java/tconstruct/util/player/ArmorExtended.java index 694e1fd4..5e724765 100644 --- a/src/main/java/tconstruct/util/player/ArmorExtended.java +++ b/src/main/java/tconstruct/util/player/ArmorExtended.java @@ -148,9 +148,9 @@ public class ArmorExtended implements IInventory if (inventory[4] != null || inventory[5] != null || inventory[6] != null) { int bonusHP = 0; - for (int i = 0; i < 3; i++) + for (int i = 4; i < 7; i++) { - ItemStack stack = inventory[i + 4]; + ItemStack stack = inventory[i]; if (stack != null && stack.getItem() instanceof IHealthAccessory) { bonusHP += ((IHealthAccessory) stack.getItem()).getHealthBoost(stack); @@ -267,7 +267,7 @@ public class ArmorExtended implements IInventory public void dropItems (ArrayList drops) { EntityPlayer player = parent.get(); - for (int i = 0; i < 4; ++i) + for (int i = 0; i < this.inventory.length; ++i) { if (this.inventory[i] != null) { @@ -290,13 +290,13 @@ public class ArmorExtended implements IInventory public void writeInventoryToStream (ByteBuf os) throws IOException { - for (int i = 0; i < 7; i++) + for (int i = 0; i < inventory.length; i++) ByteBufUtils.writeItemStack(os, inventory[i]); } public void readInventoryFromStream (ByteBuf is) throws IOException { - for (int i = 0; i < 7; i++) + for (int i = 0; i < inventory.length; i++) inventory[i] = ByteBufUtils.readItemStack(is); } } diff --git a/src/main/java/tconstruct/util/player/TPlayerHandler.java b/src/main/java/tconstruct/util/player/TPlayerHandler.java index 753ca13b..84ea84d9 100644 --- a/src/main/java/tconstruct/util/player/TPlayerHandler.java +++ b/src/main/java/tconstruct/util/player/TPlayerHandler.java @@ -186,7 +186,7 @@ public class TPlayerHandler TPlayerStats stats = TPlayerStats.get(entityplayer); if (playerData != null) { - stats = playerData; + stats.copyFrom(playerData, true); } stats.player = new WeakReference(entityplayer); diff --git a/src/main/java/tconstruct/util/player/TPlayerStats.java b/src/main/java/tconstruct/util/player/TPlayerStats.java index b5bf6d15..67f65142 100644 --- a/src/main/java/tconstruct/util/player/TPlayerStats.java +++ b/src/main/java/tconstruct/util/player/TPlayerStats.java @@ -70,6 +70,23 @@ public class TPlayerStats implements IExtendedEntityProperties { } + public void copyFrom(TPlayerStats stats, boolean copyCalc) + { + this.armor = stats.armor; + this.knapsack = stats.knapsack; + this.beginnerManual = stats.beginnerManual; + this.materialManual = stats.materialManual; + this.smelteryManual = stats.smelteryManual; + this.battlesignBonus = stats.battlesignBonus; + + if (copyCalc) { + this.bonusHealth = stats.bonusHealth; + this.bonusHealthClient = stats.bonusHealthClient; + this.hunger = stats.hunger; + this.level = stats.level; + } + } + public static final void register (EntityPlayer player) { player.registerExtendedProperties(TPlayerStats.PROP_NAME, new TPlayerStats(player));