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

Fixed bug where Living Armour would give its upgrades even if you didn't have the full set.

Browse source
This commit is contained in:
WayofTime 2016-02-12 20:24:20 -05:00
parent 0828e965c6
commit f195c5a486
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/WayofTime/bloodmagic/item/armour/ItemLivingArmour.java
View file

@ -100,7 +100,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
if (armourMap.containsKey(stack)) if (armourMap.containsKey(stack))
{ {
LivingArmour armour = armourMap.get(stack); LivingArmour armour = armourMap.get(stack);
if (armour != null) if (armour != null && isEnabled(stack))
{ {
for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet()) for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
{ {
@ -227,7 +227,15 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
} }
LivingArmour armour = armourMap.get(stack); LivingArmour armour = armourMap.get(stack);
if (LivingArmour.hasFullSet(player))
{
this.setIsEnabled(stack, true);
armour.onTick(world, player); armour.onTick(world, player);
} else
{
this.setIsEnabled(stack, false);
}
setLivingArmour(stack, armour, false); setLivingArmour(stack, armour, false);
} }
} }
@ -235,9 +243,9 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
@Override @Override
public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack) public Multimap<String, AttributeModifier> getAttributeModifiers(ItemStack stack)
{ {
if (this == ModItems.livingArmourChest) if (this == ModItems.livingArmourChest && isEnabled(stack))
{ {
LivingArmour armour = getLivingArmour(stack); LivingArmour armour = ItemLivingArmour.getLivingArmour(stack);
return armour.getAttributeModifiers(); return armour.getAttributeModifiers();
} }
@ -348,7 +356,7 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
int shielding = 0; int shielding = 0;
if (armour != null) if (armour != null && isEnabled(stack))
{ {
for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet()) for (Entry<String, LivingArmourUpgrade> entry : armour.upgradeMap.entrySet())
{ {
@ -362,4 +370,18 @@ public class ItemLivingArmour extends ItemArmor implements ISpecialArmor, IRevea
return 0; return 0;
} }
public void setIsEnabled(ItemStack stack, boolean bool)
{
NBTHelper.checkNBT(stack);
NBTTagCompound tag = stack.getTagCompound();
tag.setBoolean("enabled", bool);
}
public boolean isEnabled(ItemStack stack)
{
NBTHelper.checkNBT(stack);
NBTTagCompound tag = stack.getTagCompound();
return tag.getBoolean("enabled");
}
} }