From 8b0863b572611f7fb8cfaa9cc5a84c949b60247a Mon Sep 17 00:00:00 2001 From: sisyphussy Date: Sun, 20 Jul 2025 06:50:39 +0200 Subject: [PATCH] Fix Collar of Pain lagging upon using /kill (#15) Co-authored-by: koolkrafter5 --- src/main/java/fox/spiteful/forbidden/FMEventHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java index 7289f10..1a11cca 100644 --- a/src/main/java/fox/spiteful/forbidden/FMEventHandler.java +++ b/src/main/java/fox/spiteful/forbidden/FMEventHandler.java @@ -512,7 +512,7 @@ public class FMEventHandler { EntityPlayer player = (EntityPlayer) event.entityLiving; ItemStack amulet = BaublesApi.getBaubles(player).getStackInSlot(0); if (amulet != null && amulet.getItem() == ForbiddenItems.subCollar) { - int doses = 3 * (int) event.ammount; + int doses = 3 * (int) Math.min(event.ammount, event.entityLiving.getHealth()); if (event.source.getEntity() != null && event.source.getEntity() instanceof EntityPlayer) { EntityPlayer dom = (EntityPlayer) event.source.getEntity(); int chance = 1; @@ -527,8 +527,9 @@ public class FMEventHandler { ent.motionZ += (player.worldObj.rand.nextFloat() - player.worldObj.rand.nextFloat()) * 0.1F; } } + ItemSubCollar collar = ((ItemSubCollar) ForbiddenItems.subCollar); for (int x = 0; x < doses; x++) { - ((ItemSubCollar) ForbiddenItems.subCollar).addVis(amulet, primals[randy.nextInt(6)], 1, true); + collar.addVis(amulet, primals[randy.nextInt(6)], 1, true); } } }