Fix some potions not able to be serialized

EssentialsX · May 13, 2024 · 26d4dcd · 26d4dcd
1 parent 35c150d
commit 26d4dcd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Essentials/src/main/java/com/earth2me/essentials/items/FlatItemDb.java b/Essentials/src/main/java/com/earth2me/essentials/items/FlatItemDb.java
@@ -333,12 +333,13 @@ public boolean equals(Object o) {
                 final EssentialPotionData that = (EssentialPotionData) o;
                 return upgraded == that.upgraded &&
                     extended == that.extended &&
-                    type == that.type;
+                    // Use the getters here to ensure the fallbacks are being used
+                    getType() == that.getType();
             }
 
             @Override
             public int hashCode() {
-                return Objects.hash(type, upgraded, extended);
+                return Objects.hash(getType(), upgraded, extended);
             }
         }
     }

diff --git a/...ers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernPotionMetaProvider.java b/...ers/BaseProviders/src/main/java/net/ess3/provider/providers/ModernPotionMetaProvider.java
@@ -76,7 +76,15 @@ public boolean isUpgraded(ItemStack stack) {
     public PotionType getBasePotionType(ItemStack stack) {
         final PotionMeta meta = (PotionMeta) stack.getItemMeta();
         //noinspection DataFlowIssue
-        return meta.getBasePotionType();
+        PotionType type = meta.getBasePotionType();
+        //noinspection DataFlowIssue
+        final String name = type.name();
+        if (name.startsWith("LONG_")) {
+            type = PotionType.valueOf(name.substring(5));
+        } else if (name.startsWith("STRONG_")) {
+            type = PotionType.valueOf(name.substring(7));
+        }
+        return type;
     }
 
     @Override