at least it boots now

potion data is so fucked up man
EssentialsX · May 1, 2024 · 0decadb · 0decadb
1 parent 3749402
commit 0decadb
Showing 1 changed file with 10 additions and 4 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
@@ -224,7 +224,8 @@ public Collection<String> listNames() {
     public static class ItemData {
         private Material material;
         private String[] fallbacks = null;
-        private PotionMetaProvider.AbstractPotionData potionData = null;
+        // todo unfuck all of this
+        //private PotionMetaProvider.AbstractPotionData potionData = null;
         private EntityType entity = null;
 
         ItemData(final Material material) {
@@ -233,7 +234,7 @@ public static class ItemData {
 
         ItemData(final Material material, final PotionMetaProvider.AbstractPotionData potionData) {
             this.material = material;
-            this.potionData = potionData;
+            //this.potionData = potionData;
         }
 
         ItemData(final Material material, final EntityType entity) {
@@ -243,7 +244,8 @@ public static class ItemData {
 
         @Override
         public int hashCode() {
-            return (31 * material.hashCode()) ^ potionData.hashCode();
+            return 31 * material.hashCode();
+            //return (31 * material.hashCode()) ^ potionData.hashCode();
         }
 
         @Override
@@ -268,21 +270,25 @@ public Material getMaterial() {
         }
 
         public PotionMetaProvider.AbstractPotionData getPotionData() {
-            return this.potionData;
+            return null;
+            //return this.potionData;
         }
 
         public EntityType getEntity() {
             return this.entity;
         }
 
         private boolean potionDataEquals(final ItemData o) {
+            return true;
+            /*
             if (this.potionData == null && o.getPotionData() == null) {
                 return true;
             } else if (this.potionData != null && o.getPotionData() != null) {
                 return this.potionData.equals(o.getPotionData());
             } else {
                 return false;
             }
+             */
         }
 
         private boolean entityEquals(final ItemData o) {