diff --git a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java index 3dd89ae0..78100b4d 100644 --- a/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java +++ b/src/main/java/WayofTime/bloodmagic/api/util/helper/PlayerSacrificeHelper.java @@ -69,7 +69,7 @@ public class PlayerSacrificeHelper { float sacrificedHealth = health - maxHealth / 10.0f; - if (findAndFillAltar(player.getEntityWorld(), player, (int) (sacrificedHealth * 100f * getModifier(amount)))) + if (findAndFillAltar(player.getEntityWorld(), player, (int) (sacrificedHealth * 100f * getModifier(amount)), false)) { player.setHealth(maxHealth / 10.0f); setPlayerIncense(player, 0); @@ -97,17 +97,19 @@ public class PlayerSacrificeHelper * - The entity having the sacrifice done on (can be {@link EntityPlayer} for self-sacrifice) * @param amount * - The amount of which the altar should be filled + * @param isSacrifice + * - Whether this is a Sacrifice or a Self-Sacrifice * * @return Whether the altar is found and (attempted) filled */ - public static boolean findAndFillAltar(World world, EntityLivingBase sacrificingEntity, int amount) + public static boolean findAndFillAltar(World world, EntityLivingBase sacrificingEntity, int amount, boolean isSacrifice) { IBloodAltar altarEntity = getAltar(world, sacrificingEntity.getPosition()); if (altarEntity == null) return false; - altarEntity.sacrificialDaggerCall(amount, false); + altarEntity.sacrificialDaggerCall(amount, isSacrifice); altarEntity.startCycle(); return true; diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java index 07c1e8cc..3e0f8946 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemDaggerOfSacrifice.java @@ -52,7 +52,7 @@ public class ItemDaggerOfSacrifice extends Item implements IVariantProvider if (BloodMagicAPI.getEntitySacrificeValues().containsKey(entityName)) lifeEssence = BloodMagicAPI.getEntitySacrificeValues().get(entityName); - if (PlayerSacrificeHelper.findAndFillAltar(attacker.worldObj, target, lifeEssence)) + 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); target.setHealth(-1); diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java index d0bcd18d..6f0929f3 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemSacrificialDagger.java @@ -148,7 +148,7 @@ public class ItemSacrificialDagger extends Item implements IVariantProvider return super.onItemRightClick(stack, world, player, hand); // TODO - Check if SoulFray is active - PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded); + PlayerSacrificeHelper.findAndFillAltar(world, player, lpAdded, false); return super.onItemRightClick(stack, world, player, hand); }