diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-11 23:18:02 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-11 23:18:02 +1000 |
| commit | 9a0083c498a8014286fec71683c53b9ec797ee47 (patch) | |
| tree | b7098738737d53f6af9da14b4a948975c1e5c1e0 /src/Java/gtPlusPlus/core/util/nbt | |
| parent | b9168d6c0d36a0bc3aa1dab551f2bd2fdda1dc9b (diff) | |
| download | GT5-Unofficial-9a0083c498a8014286fec71683c53b9ec797ee47.tar.gz GT5-Unofficial-9a0083c498a8014286fec71683c53b9ec797ee47.tar.bz2 GT5-Unofficial-9a0083c498a8014286fec71683c53b9ec797ee47.zip | |
$ Fixed HP boost not applying properly.
$ Fixed modifiers not stacking properly.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util/nbt')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java index 629dcea636..72f65c7924 100644 --- a/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java +++ b/src/Java/gtPlusPlus/core/util/nbt/ModularArmourUtils.java @@ -96,9 +96,13 @@ public class ModularArmourUtils { } public static void setModifierLevel(ItemStack aStack, Modifiers aMod, int aInt) { + + int mCurrentLevel = getModifierLevel(aStack, aMod); + int mNewTotalLevel = mCurrentLevel+aInt; + NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - if (aMod.isValidLevel(aInt)){ - tNBT.setInteger(aMod.getModifier(), aInt); + if (aMod.isValidLevel(mNewTotalLevel)){ + tNBT.setInteger(aMod.getModifier(), mNewTotalLevel); GT_Utility.ItemNBT.setNBT(aStack, tNBT); } else { @@ -107,6 +111,10 @@ public class ModularArmourUtils { } } } + + public static int getModifierLevel(ItemStack aStack, Pair<Modifiers, Integer> newPair) { + return getModifierLevel(aStack, newPair.getKey()); + } public static int getModifierLevel(ItemStack aStack, Modifiers aMod) { NBTTagCompound tNBT = NBTUtils.getNBT(aStack); |