From 9088ccf644699560196e4863e545f66c7e860259 Mon Sep 17 00:00:00 2001 From: Keraldi Date: Sun, 12 Jun 2022 00:12:24 +0200 Subject: [PATCH] Intercept onLivingHurt if player holds Dagger of Sacrifice See #1881 Signed-off-by: Keraldi --- .../bloodmagic/util/handler/event/GenericHandler.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java index 893a01bffc..cae483a99e 100644 --- a/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java +++ b/src/main/java/wayoftime/bloodmagic/util/handler/event/GenericHandler.java @@ -53,6 +53,7 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.anointment.AnointmentHolder; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.common.item.BloodOrb; import wayoftime.bloodmagic.common.item.IBindable; import wayoftime.bloodmagic.common.item.IBloodOrb; @@ -204,8 +205,16 @@ public void onLivingHurt(LivingHurtEvent event) } ItemStack heldStack = sourcePlayer.getHeldItemMainhand(); + + if (heldStack.getItem() == BloodMagicItems.DAGGER_OF_SACRIFICE.get()) + { + event.setAmount(0); + return; + } + AnointmentHolder holder = AnointmentHolder.fromItemStack(heldStack); + if (holder != null) { double additionalDamage = holder.getAdditionalDamage(sourcePlayer, heldStack, event.getAmount(), living);