diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index 61fdeebb..8ba122b1 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -65,8 +65,12 @@ public class TinkerArmorEvents return; ItemStack glove = TPlayerStats.get(event.entityPlayer).armor.getStackInSlot(1); - if(event.entityPlayer.worldObj.isRemote) // todo: sync extended inventory with clients so this stuff and rendering is done properly... - glove = ArmorProxyClient.armorExtended.getStackInSlot(1); + if(event.entityPlayer.worldObj.isRemote) { // todo: sync extended inventory with clients so this stuff and rendering is done properly... + if(ArmorProxyClient.armorExtended != null) + glove = ArmorProxyClient.armorExtended.getStackInSlot(1); + else + glove = null; + } if(glove == null || !glove.hasTagCompound()) return; diff --git a/src/main/java/tconstruct/armor/player/TPlayerStats.java b/src/main/java/tconstruct/armor/player/TPlayerStats.java index 41bd0b24..66fdec21 100644 --- a/src/main/java/tconstruct/armor/player/TPlayerStats.java +++ b/src/main/java/tconstruct/armor/player/TPlayerStats.java @@ -38,7 +38,8 @@ public class TPlayerStats implements IExtendedEntityProperties, IPlayerExtendedI public TPlayerStats() { - + this.armor = new ArmorExtended(); + this.knapsack = new KnapsackInventory(); } public TPlayerStats(EntityPlayer entityplayer) diff --git a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java index 0dd4195e..e46c5ff1 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -20,6 +20,8 @@ public class InventoryTabKnapsack extends AbstractTab @Override public boolean shouldAddToList () { - return ArmorProxyClient.armorExtended.inventory[2] != null && ArmorProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack; + return ArmorProxyClient.armorExtended != null + && ArmorProxyClient.armorExtended.inventory[2] != null + && ArmorProxyClient.armorExtended.inventory[2].getItem() == TinkerArmor.knapsack; } }