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

Created fillWill method for the tartaric gem.

Browse source
This commit is contained in:
WayofTime 2016-02-19 08:03:33 -05:00
parent b818939a9c
commit a88d7f43b8
5 changed files with 29 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/api/soul/IDemonWillGem.java
View file

@ -27,4 +27,6 @@ public interface IDemonWillGem
public int getMaxWill(EnumDemonWillType type, ItemStack willGemStack);
public double drainWill(EnumDemonWillType type, ItemStack stack, double drainAmount);
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount);
}

10
src/main/java/WayofTime/bloodmagic/api/soul/PlayerDemonWillHandler.java
View file

@ -154,10 +154,7 @@ public class PlayerDemonWillHandler
{
if (stack.getItem() instanceof IDemonWillGem)
{
double souls = ((IDemonWillGem) stack.getItem()).getWill(type, stack);
double fill = Math.min(((IDemonWillGem) stack.getItem()).getMaxWill(type, stack) - souls, remaining);
((IDemonWillGem) stack.getItem()).setWill(type, stack, fill + souls);
remaining -= fill;
remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining);
if (remaining <= 0)
{
@ -182,10 +179,7 @@ public class PlayerDemonWillHandler
{
if (stack.getItem() instanceof IDemonWillGem)
{
double souls = ((IDemonWillGem) stack.getItem()).getWill(type, stack);
double fill = Math.min(((IDemonWillGem) stack.getItem()).getMaxWill(type, stack) - souls, remaining);
((IDemonWillGem) stack.getItem()).setWill(type, stack, fill + souls);
remaining -= fill;
remaining -= ((IDemonWillGem) stack.getItem()).fillWill(type, stack, remaining);
if (remaining <= 0)
{