fix: "attribute modifier already applied" error, close #348

WiIIiam278 · Jul 26, 2024 · 83b5209 · 83b5209
1 parent 8e9850d
commit 83b5209
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java b/bukkit/src/main/java/net/william278/husksync/data/BukkitData.java
@@ -643,7 +643,7 @@ private static void applyAttribute(@Nullable AttributeInstance instance, @Nullab
             instance.setBaseValue(attribute == null ? instance.getDefaultValue() : attribute.baseValue());
             instance.getModifiers().forEach(instance::removeModifier);
             if (attribute != null) {
-                attribute.modifiers().forEach(mod -> instance.addModifier(adapt(mod, plugin)));
+                attribute.modifiers().stream().distinct().forEach(mod -> instance.addModifier(adapt(mod, plugin)));
             }
         }
 

diff --git a/common/src/main/java/net/william278/husksync/data/Data.java b/common/src/main/java/net/william278/husksync/data/Data.java
@@ -366,7 +366,13 @@ public Modifier(@NotNull String name, double amount, int operationType, int equi
 
             @Override
             public boolean equals(Object obj) {
-                return obj instanceof Modifier modifier && modifier.uuid().equals(uuid());
+                if (obj instanceof Modifier other) {
+                    if (uuid == null || other.uuid == null) {
+                        return name.equals(other.name);
+                    }
+                    return uuid.equals(other.uuid);
+                }
+                return super.equals(obj);
             }
 
             public double modify(double value) {