From c10b9e8e3af97fc20d6c7090edd2ac716b1d6ed4 Mon Sep 17 00:00:00 2001 From: Sollace Date: Sat, 25 Jun 2022 00:33:57 +0200 Subject: [PATCH] Nerf food poisoning effect --- .../unicopia/entity/effect/FoodPoisoningStatusEffect.java | 5 +++-- .../java/com/minelittlepony/unicopia/item/toxin/Toxin.java | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/minelittlepony/unicopia/entity/effect/FoodPoisoningStatusEffect.java b/src/main/java/com/minelittlepony/unicopia/entity/effect/FoodPoisoningStatusEffect.java index 49fa8bcd..b95f7530 100644 --- a/src/main/java/com/minelittlepony/unicopia/entity/effect/FoodPoisoningStatusEffect.java +++ b/src/main/java/com/minelittlepony/unicopia/entity/effect/FoodPoisoningStatusEffect.java @@ -33,8 +33,9 @@ public class FoodPoisoningStatusEffect extends StatusEffect { entity.addStatusEffect(nausea); } - entity.damage(MagicalDamageSource.FOOD_POISONING, amplifier); - + if (entity.getHealth() > amplifier) { + entity.damage(MagicalDamageSource.FOOD_POISONING, amplifier); + } } @Override diff --git a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxin.java b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxin.java index 1ce0f337..0e9007ff 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxin.java +++ b/src/main/java/com/minelittlepony/unicopia/item/toxin/Toxin.java @@ -32,8 +32,8 @@ public interface Toxin extends Affliction { Toxin STRENGTH = of(StatusEffects.STRENGTH, 30, 0); Toxin BLINDNESS = of(StatusEffects.BLINDNESS, 30, 0); Toxin POISON = of(StatusEffects.POISON, 45, 2); - Toxin FOOD_POISONING = of(UEffects.FOOD_POISONING, 300, 2); - Toxin WEAK_FOOD_POISONING = of(UEffects.FOOD_POISONING, 150, 1); + Toxin FOOD_POISONING = of(UEffects.FOOD_POISONING, 100, 2); + Toxin WEAK_FOOD_POISONING = of(UEffects.FOOD_POISONING, 50, 1); Toxin LOVE_SICKNESS = of(Text.of("Love Sickness "), (player, stack) -> { FoodComponent food = stack.getItem().getFoodComponent();