aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-05-31 18:09:30 +0200
committerBlood-Asp <bloodasphendrik@gmail.com>2017-05-31 18:09:30 +0200
commit40304ed2f583e6d6a99a0115056d2135b510602d (patch)
tree62bfb95911ce1bdf943dbe1eaf837b0ebfa49c44 /src/main
parent6398c0650694dca192281e4f2bbe9dcd9d5546e7 (diff)
downloadGT5-Unofficial-40304ed2f583e6d6a99a0115056d2135b510602d.tar.gz
GT5-Unofficial-40304ed2f583e6d6a99a0115056d2135b510602d.tar.bz2
GT5-Unofficial-40304ed2f583e6d6a99a0115056d2135b510602d.zip
Catch login armor crash
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/common/items/armor/ModularArmor_Item.java4
1 files changed, 4 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 d2e51e67f1..ef961b944f 100644
--- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
+++ b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
@@ -89,6 +89,7 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
data = fillArmorData((EntityPlayer) player, armor);
}
if (player != null && armor != null && source != null) {
+ try{
double tmp = 0.0d;
if (source.isMagicDamage()) {
tmp = data.mStat.get(StatType.MAGICDEFENCE);
@@ -127,6 +128,9 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
tmp = 1.0f - ((1.0f - tmp) / 2.0f);
}
return new ISpecialArmor.ArmorProperties(0, data.getBaseAbsorptionRatio() * tmp, 1000);
+ }catch(Exception e){System.err.println(e);
+ return new ISpecialArmor.ArmorProperties(0, 0, 0);
+ }
} else {
return new ISpecialArmor.ArmorProperties(0, 0, 0);