From 32405abcf757f8b752cfc2bf5afd50c1ce93c1b6 Mon Sep 17 00:00:00 2001 From: TehBrian Date: Sun, 19 Nov 2023 21:53:08 -0500 Subject: [PATCH] fix potion type comparisons oops, PotionType isn't an enum --- .../java/city/thefloating/floatyplugin/milk/MilkListener.java | 2 +- .../java/city/thefloating/floatyplugin/tag/TagListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/city/thefloating/floatyplugin/milk/MilkListener.java b/src/main/java/city/thefloating/floatyplugin/milk/MilkListener.java index 13a13cf..0218e55 100644 --- a/src/main/java/city/thefloating/floatyplugin/milk/MilkListener.java +++ b/src/main/java/city/thefloating/floatyplugin/milk/MilkListener.java @@ -29,7 +29,7 @@ public void onMilkSplashPotion(final EntityPotionEffectEvent event) { return; } - if (newEffect.getType() == Milk.EFFECT + if (newEffect.getType().equals(Milk.EFFECT) && newEffect.getAmplifier() == Milk.AMPLIFIER && event.getEntity() instanceof final Player player) { event.setCancelled(true); diff --git a/src/main/java/city/thefloating/floatyplugin/tag/TagListener.java b/src/main/java/city/thefloating/floatyplugin/tag/TagListener.java index 4de17d6..da845ec 100644 --- a/src/main/java/city/thefloating/floatyplugin/tag/TagListener.java +++ b/src/main/java/city/thefloating/floatyplugin/tag/TagListener.java @@ -43,7 +43,7 @@ public void onPotionEffect(final EntityPotionEffectEvent event) { return; } - if (event.getNewEffect().getType() == PotionEffectType.BLINDNESS + if (event.getNewEffect().getType().equals(PotionEffectType.BLINDNESS) && Milieu.of(player) == Milieu.ONEROUS) { return; }