diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-08 17:52:28 +0100 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-03-08 17:52:28 +0100 |
| commit | 48d7a1ee5dc9919a36c7b0bad7cfe50364d35267 (patch) | |
| tree | dd00077e5a684717e4adfdb97b9af5fef18c9674 /src/main/java/gregtech | |
| parent | 9c7e95b245fa4c0d943f0540f43470e044e003be (diff) | |
| download | GT5-Unofficial-48d7a1ee5dc9919a36c7b0bad7cfe50364d35267.tar.gz GT5-Unofficial-48d7a1ee5dc9919a36c7b0bad7cfe50364d35267.tar.bz2 GT5-Unofficial-48d7a1ee5dc9919a36c7b0bad7cfe50364d35267.zip | |
Fix rubber plates in modular armor boots
Diffstat (limited to 'src/main/java/gregtech')
| -rw-r--r-- | src/main/java/gregtech/common/items/armor/components/ArmorPlating.java | 11 |
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); + } } |