aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorBlood-Asp <bloodasphendrik@gmail.com>2017-05-31 18:09:30 +0200
committerTechnus <daniel112092@gmail.com>2017-06-01 22:58:51 +0200
commit23e9b450a8545e9894483876325d752b1dd70cc2 (patch)
tree4665b17d908c7b0deba011f509e4166618de140b /src/main/java
parentdc3d19cc9cfa6ab552a7d8de9885edc7fe05fa22 (diff)
downloadGT5-Unofficial-23e9b450a8545e9894483876325d752b1dd70cc2.tar.gz
GT5-Unofficial-23e9b450a8545e9894483876325d752b1dd70cc2.tar.bz2
GT5-Unofficial-23e9b450a8545e9894483876325d752b1dd70cc2.zip
Catch login armor crash
Diffstat (limited to 'src/main/java')
-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 80e28744c0..b4b3a62e7e 100644
--- a/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
+++ b/src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
@@ -83,6 +83,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);
@@ -121,6 +122,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);