lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed a funky issue where the Sound of the Cleansing Soul did not reset the upgrade points internally

Browse source
This commit is contained in:
WayofTime 2016-08-18 07:41:56 -04:00
parent 64c06e39b5
commit fdc20b63c7
3 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.txt
View file

@ -2,6 +2,7 @@
Version 2.0.4-55 Version 2.0.4-55
------------------------------------------------------ ------------------------------------------------------
- Made Guide-API a required mod. - Made Guide-API a required mod.
- Fixed a funky issue where the Sound of the Cleansing Soul did not reset the upgrade points internally.
------------------------------------------------------ ------------------------------------------------------
Version 2.0.3-54 Version 2.0.3-54

9
src/main/java/WayofTime/bloodmagic/livingArmour/LivingArmour.java
View file

@ -68,6 +68,15 @@ public class LivingArmour implements ILivingArmour
return total; return total;
} }
public void recalculateUpgradePoints()
{
totalUpgradePoints = 0;
for (LivingArmourUpgrade upgrade : upgradeMap.values())
{
totalUpgradePoints += upgrade.getCostOfUpgrade();
}
}
@Override @Override
public Multimap<String, AttributeModifier> getAttributeModifiers() public Multimap<String, AttributeModifier> getAttributeModifiers()
{ {

33
src/main/java/WayofTime/bloodmagic/ritual/RitualUpgradeRemove.java
View file

@ -1,16 +1,9 @@
package WayofTime.bloodmagic.ritual; package WayofTime.bloodmagic.ritual;
import WayofTime.bloodmagic.api.Constants; import java.util.ArrayList;
import WayofTime.bloodmagic.api.ItemStackWrapper; import java.util.HashMap;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade; import java.util.List;
import WayofTime.bloodmagic.api.livingArmour.StatTracker; import java.util.Map.Entry;
import WayofTime.bloodmagic.api.ritual.*;
import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import WayofTime.bloodmagic.registry.ModItems;
import com.google.common.collect.Iterables;
import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
@ -18,11 +11,20 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World; import net.minecraft.world.World;
import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.api.livingArmour.LivingArmourUpgrade;
import WayofTime.bloodmagic.api.livingArmour.StatTracker;
import WayofTime.bloodmagic.api.ritual.AreaDescriptor;
import WayofTime.bloodmagic.api.ritual.EnumRuneType;
import WayofTime.bloodmagic.api.ritual.IMasterRitualStone;
import WayofTime.bloodmagic.api.ritual.Ritual;
import WayofTime.bloodmagic.api.ritual.RitualComponent;
import WayofTime.bloodmagic.api.util.helper.ItemHelper.LivingUpgrades;
import WayofTime.bloodmagic.item.armour.ItemLivingArmour;
import WayofTime.bloodmagic.livingArmour.LivingArmour;
import WayofTime.bloodmagic.registry.ModItems;
import java.util.ArrayList; import com.google.common.collect.Iterables;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
public class RitualUpgradeRemove extends Ritual public class RitualUpgradeRemove extends Ritual
{ {
@ -96,6 +98,7 @@ public class RitualUpgradeRemove extends Ritual
{ {
((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true); ((ItemLivingArmour) chestStack.getItem()).setLivingArmour(chestStack, armour, true);
ItemLivingArmour.setLivingArmour(chestStack, armour); ItemLivingArmour.setLivingArmour(chestStack, armour);
armour.recalculateUpgradePoints();
masterRitualStone.setActive(false); masterRitualStone.setActive(false);