Merge pull request #14 from Blood-Asp/unstable

Update

1 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
index 40d917344e..d2e51e67f1 100644
--- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
+++ b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
@@ -55,6 +55,7 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 	public int openGuiNr;
 	public ArmorData data;
 	public int jumpticks;
+	public int fail = 0;
 
 	// public int maxEU;
 
@@ -193,6 +194,11 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 
 	@Override
 	public void onArmorTick(World aWorld, EntityPlayer aPlayer, ItemStack aStack) {
+		if(fail>0){
+			fail--;
+			return;
+		}
+		try{
 		if (data == null) {
 			data = fillArmorData(aPlayer, aStack);
 		}
@@ -359,6 +365,9 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
 				}
 			}
 		}
+		}catch(Exception e){System.err.print(e);
+			fail = 200;
+		}
 	}
 
 	public void setEntityMotionFromVector(Entity entity, Vector3 originalPosVector, float modifier) {