diff options
| author | John <Techlone@users.noreply.github.com> | 2017-03-11 19:07:31 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-11 19:07:31 +0500 |
| commit | 7e83c04210d507146248fc6f7d7cb6e7f6605824 (patch) | |
| tree | eb4746f3b2a6021526d4c1e332f281354368f3b4 /src/main/java/gregtech/common/items/armor | |
| parent | ad8496d0a2c6b37d5fc3789806ee83c788e52aa7 (diff) | |
| parent | d7203bccbde715d006783615c4c05a646d58ccaa (diff) | |
| download | GT5-Unofficial-7e83c04210d507146248fc6f7d7cb6e7f6605824.tar.gz GT5-Unofficial-7e83c04210d507146248fc6f7d7cb6e7f6605824.tar.bz2 GT5-Unofficial-7e83c04210d507146248fc6f7d7cb6e7f6605824.zip | |
Merge pull request #10 from Blood-Asp/unstable
Update
Diffstat (limited to 'src/main/java/gregtech/common/items/armor')
| -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); + } } |