From 83e71312c4867356eb2f85482522b44628abda45 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sun, 28 Jun 2015 10:44:56 +0200 Subject: [PATCH] Prevent crashes with incorrectly initialized armor stuff #1668 --- src/main/java/tconstruct/armor/TinkerArmorEvents.java | 8 ++++++-- src/main/java/tconstruct/armor/player/TPlayerStats.java | 3 ++- .../java/tconstruct/client/tabs/InventoryTabKnapsack.java | 4 +++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/tconstruct/armor/TinkerArmorEvents.java b/src/main/java/tconstruct/armor/TinkerArmorEvents.java index 61fdeebbc20..8ba122b19cc 100644 --- a/src/main/java/tconstruct/armor/TinkerArmorEvents.java +++ b/src/main/java/tconstruct/armor/TinkerArmorEvents.java @@ -65,8 +65,12 @@ public void armorMineSpeed (net.minecraftforge.event.entity.player.PlayerEvent.B 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 41bd0b24148..66fdec21c01 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 0dd4195e582..e46c5ff1d72 100644 --- a/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java +++ b/src/main/java/tconstruct/client/tabs/InventoryTabKnapsack.java @@ -20,6 +20,8 @@ public void onTabClicked () @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; } }