aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech')
-rw-r--r--src/main/java/gregtech/common/items/armor/components/ArmorPlating.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java b/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
index 9f87678e05..2e02ac7ba6 100644
--- a/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
+++ b/src/main/java/gregtech/common/items/armor/components/ArmorPlating.java
@@ -78,7 +78,7 @@ public class ArmorPlating extends ArmorComponent{
@Override
public void calculateArmor(ArmorData aArmorData) {
- calDef(StatType.FALLDEFENCE, aArmorData);
+ calDefAdd(StatType.FALLDEFENCE, aArmorData);
calDef(StatType.PHYSICALDEFENCE, aArmorData);
calDef(StatType.PROJECTILEDEFENCE, aArmorData);
calDef(StatType.FIREDEFENCE, aArmorData);
@@ -99,5 +99,14 @@ public class ArmorPlating extends ArmorComponent{
float tComponentDef = mStat.get(aType);
aArmorData.mStat.put(aType, tArmorDef + ((1.0f -tArmorDef) * tComponentDef));
}
+
+ public void calDefAdd(StatType aType, ArmorData aArmorData){
+ float tArmorDef = 0.0f;
+ if(aArmorData.mStat.containsKey(aType)){
+ tArmorDef = aArmorData.mStat.get(aType);
+ aArmorData.mStat.remove(aType);}
+ float tComponentDef = mStat.get(aType);
+ aArmorData.mStat.put(aType, tArmorDef + tComponentDef);
+ }
}