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

Tweaked Tartaric Gem interactions.

Browse source
This commit is contained in:
WayofTime 2016-03-29 16:34:39 -04:00
parent 39dbaea109
commit 3fc5a76d53
4 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -215,7 +215,8 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
@Override
public int getMaxWill(EnumDemonWillType type, ItemStack soulGemStack)
{
if (!type.equals(getCurrentType(soulGemStack)))
EnumDemonWillType currentType = getCurrentType(soulGemStack);
if (!type.equals(currentType) && currentType != EnumDemonWillType.DEFAULT)
{
return 0;
}
@ -263,7 +264,7 @@ public class ItemSoulGem extends Item implements IDemonWillGem, IMeshProvider, I
@Override
public double fillWill(EnumDemonWillType type, ItemStack stack, double fillAmount)
{
if (!type.equals(getCurrentType(stack)))
if (!type.equals(getCurrentType(stack)) && this.getWill(getCurrentType(stack), stack) > 0)
{
return 0;
}