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

Fixed the Hellfire Forge filling the Tartaric Gem with the incorrect Will from the Demon Aura, without actually adding to the gem

Browse source
This commit is contained in:
WayofTime 2016-07-09 21:45:35 -04:00
parent c34bd48aa5
commit b8745e34ee
5 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/WayofTime/bloodmagic/item/soul/ItemSoulGem.java
View file

@ -57,7 +57,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
double drain = Math.min(this.getWill(type, stack), this.getMaxWill(type, stack) / 10);
double filled = PlayerDemonWillHandler.addDemonWill(type, player, drain, stack);
this.drainWill(type, stack, filled);
this.drainWill(type, stack, filled, true);
return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
}
@ -196,7 +196,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
}
@Override
public double drainWill(EnumDemonWillType type, ItemStack soulGemStack, double drainAmount)
public double drainWill(EnumDemonWillType type, ItemStack soulGemStack, double drainAmount, boolean doDrain)
{
EnumDemonWillType currentType = this.getCurrentType(soulGemStack);
if (currentType != type)
@ -206,7 +206,11 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
double souls = getWill(type, soulGemStack);
double soulsDrained = Math.min(drainAmount, souls);
setWill(type, soulGemStack, souls - soulsDrained);
if (!doDrain)
{
setWill(type, soulGemStack, souls - soulsDrained);
}
return soulsDrained;
}
@ -271,7 +275,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
}
@Override
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount)
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount, boolean doFill)
{
if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0)
{
@ -283,12 +287,11 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
double filled = Math.min(fillAmount, maxWill - current);
if (filled > 0)
if (filled > 0 && doFill)
{
this.setWill(type, stack, filled + current);
return filled;
}
return 0;
return filled;
}
}