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

Make sure sacrifice packs don't store more than capacity

Browse source
This commit is contained in:
Nick 2016-01-22 02:21:10 -08:00
parent 3920e0926f
commit a769e9d0a7
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSacrifice.java
View file

@ -69,6 +69,13 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator
return stack; return stack;
} }
@Override
public void onArmorTick(World world, EntityPlayer player, ItemStack stack)
{
if (getStoredLP(stack) > CAPACITY)
setStoredLP(stack, CAPACITY);
}
@Override @Override
public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
{ {
@ -93,7 +100,7 @@ public class ItemPackSacrifice extends ItemArmor implements IAltarManipulator
if (toAdd > CAPACITY) if (toAdd > CAPACITY)
toAdd = CAPACITY; toAdd = CAPACITY;
setStoredLP(stack, getStoredLP(stack) + toAdd); setStoredLP(stack, Math.min(getStoredLP(stack) + toAdd, CAPACITY));
} }
public void setStoredLP(ItemStack stack, int lp) public void setStoredLP(ItemStack stack, int lp)

5
src/main/java/WayofTime/bloodmagic/item/gear/ItemPackSelfSacrifice.java
View file

@ -90,6 +90,9 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
NetworkHelper.getSoulNetwork(player).hurtPlayer(player, 1.0F); NetworkHelper.getSoulNetwork(player).hurtPlayer(player, 1.0F);
addLP(stack, CONVERSION); addLP(stack, CONVERSION);
} }
if (getStoredLP(stack) > CAPACITY)
setStoredLP(stack, CAPACITY);
} }
@Override @Override
@ -116,7 +119,7 @@ public class ItemPackSelfSacrifice extends ItemArmor implements IAltarManipulato
if (toAdd > CAPACITY) if (toAdd > CAPACITY)
toAdd = CAPACITY; toAdd = CAPACITY;
setStoredLP(stack, getStoredLP(stack) + toAdd); setStoredLP(stack, Math.min(getStoredLP(stack) + toAdd, CAPACITY));
} }
public void setStoredLP(ItemStack stack, int lp) public void setStoredLP(ItemStack stack, int lp)