diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index c22680c0..63fbdfca 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -52,6 +52,9 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider if (BloodMagicAPI.getEntitySacrificeValues().containsKey(entityName)) lifeEssence = BloodMagicAPI.getEntitySacrificeValues().get(entityName); + if (lifeEssence <= 0) + return false; + if (PlayerSacrificeHelper.findAndFillAltar(attacker.worldObj, target, lifeEssence, true)) { target.worldObj.playSound(null, target.posX, target.posY, target.posZ, SoundEvents.BLOCK_FIRE_EXTINGUISH, SoundCategory.BLOCKS, 0.5F, 2.6F + (target.worldObj.rand.nextFloat() - target.worldObj.rand.nextFloat()) * 0.8F); diff --git a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java index 4c73d130..71fa79cd 100644 --- a/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java +++ b/src/main/java/WayofTime/bloodmagic/ritual/RitualWellOfSuffering.java @@ -1,6 +1,7 @@ package WayofTime.bloodmagic.ritual; import WayofTime.bloodmagic.ConfigHandler; +import WayofTime.bloodmagic.api.BloodMagicAPI; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.saving.SoulNetwork; import WayofTime.bloodmagic.api.ritual.*; @@ -87,20 +88,23 @@ public class RitualWellOfSuffering extends Ritual for (EntityLivingBase entity : entities) { - if (!ConfigHandler.wellOfSufferingBlacklist.contains(entity.getClass().getSimpleName())) + if (ConfigHandler.wellOfSufferingBlacklist.contains(entity.getClass().getSimpleName())) + continue; + + if (BloodMagicAPI.getEntitySacrificeValues().get(entity.getClass().getSimpleName()) <= 0) + continue; + + if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) { - if (entity.isEntityAlive() && !(entity instanceof EntityPlayer)) + if (entity.attackEntityFrom(DamageSource.outOfWorld, 1)) { - if (entity.attackEntityFrom(DamageSource.outOfWorld, 1)) + tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true); + + totalEffects++; + + if (totalEffects >= maxEffects) { - tileAltar.sacrificialDaggerCall(SACRIFICE_AMOUNT, true); - - totalEffects++; - - if (totalEffects >= maxEffects) - { - break; - } + break; } } }