Prevent crashes with incorrectly initialized armor stuff #1668

SlimeKnights · Jun 28, 2015 · 83e7131 · 83e7131
1 parent 13db048
commit 83e7131
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;
     }
 }