Updated wPotionEffectToPotionEffect method for Minecraft 1.20.6

fulminazzo · Dec 23, 2024 · da2ed9a · da2ed9a
1 parent 564d5a0
commit da2ed9a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/wrappers/bukkit/src/main/java/it/fulminazzo/yagl/WrappersAdapter.java b/wrappers/bukkit/src/main/java/it/fulminazzo/yagl/WrappersAdapter.java
@@ -542,8 +542,16 @@ private static <T> void playInternalSound(final @NotNull Player player, final @N
      * @return the potion effect
      */
     public static @NotNull org.bukkit.potion.PotionEffect wPotionEffectToPotionEffect(final @NotNull PotionEffect potionEffect) {
-        final String effect = potionEffect.getName();
-        final PotionEffectType type = EnumUtils.valueOf(PotionEffectType.class, effect, "getByName");
+        String effect = potionEffect.getName();
+        PotionEffectType type;
+        try {
+            type = EnumUtils.valueOf(PotionEffectType.class, effect, "getByName");
+        } catch (IllegalArgumentException e) {
+            // For Minecraft 1.20.6 and above
+            effect = effect.replace(" ", "_").toLowerCase();
+            if (effect.equalsIgnoreCase("bad_luck")) effect = "unluck";
+            type = EnumUtils.valueOf(PotionEffectType.class, effect, "getByName");
+        }
         try {
             return new org.bukkit.potion.PotionEffect(type, potionEffect.getDurationInTicks(), potionEffect.getAmplifier(),
                     potionEffect.isShowingParticles(), potionEffect.isShowingParticles(),