From 669fc77eabe572dbae2d3847df91edf7203cd99c Mon Sep 17 00:00:00 2001 From: Sen Date: Sat, 31 May 2025 20:09:23 +0200 Subject: [PATCH] fix potions --- common/src/main/java/common/entity/npc/EntityMage.java | 5 ++++- common/src/main/java/common/item/ItemPotion.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/common/entity/npc/EntityMage.java b/common/src/main/java/common/entity/npc/EntityMage.java index ecedfe9..b93e083 100755 --- a/common/src/main/java/common/entity/npc/EntityMage.java +++ b/common/src/main/java/common/entity/npc/EntityMage.java @@ -48,7 +48,10 @@ public class EntityMage extends EntityNPC { for (PotionEffect potioneffect : list) { - this.addEffect(new PotionEffect(potioneffect)); + if(potioneffect.getPotion().isInstant()) + potioneffect.getPotion().onImpact(null, null, this, potioneffect.getAmplifier(), 1.0); + else + this.addEffect(new PotionEffect(potioneffect)); } } } diff --git a/common/src/main/java/common/item/ItemPotion.java b/common/src/main/java/common/item/ItemPotion.java index 12690e7..eeb5cfa 100755 --- a/common/src/main/java/common/item/ItemPotion.java +++ b/common/src/main/java/common/item/ItemPotion.java @@ -104,7 +104,10 @@ public class ItemPotion extends Item { for (PotionEffect potioneffect : list) { - playerIn.addEffect(new PotionEffect(potioneffect)); + if(potioneffect.getPotion().isInstant()) + potioneffect.getPotion().onImpact(null, null, playerIn, potioneffect.getAmplifier(), 1.0); + else + playerIn.addEffect(new PotionEffect(potioneffect)); } } }