diff options
Diffstat (limited to 'patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch')
-rw-r--r-- | patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch new file mode 100644 index 0000000000..bbc3e41f85 --- /dev/null +++ b/patches/server/0967-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: hyper1423 <[email protected]> +Date: Sun, 3 Dec 2023 07:38:09 +0900 +Subject: [PATCH] Fix CraftMetaItem#getAttributeModifier duplication check + + +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +index 9137d6d56386111dfd072859df84e533580ee294..5cd0fbac267f9c69c5de4c200a95860f5c56d42e 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +@@ -1174,7 +1174,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { + Preconditions.checkNotNull(modifier, "AttributeModifier cannot be null"); + this.checkAttributeList(); + for (Map.Entry<Attribute, AttributeModifier> entry : this.attributeModifiers.entries()) { +- Preconditions.checkArgument(!entry.getValue().getUniqueId().equals(modifier.getUniqueId()), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier); ++ Preconditions.checkArgument(!(entry.getValue().getUniqueId().equals(modifier.getUniqueId()) && entry.getKey() == attribute), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier); // Paper + } + return this.attributeModifiers.put(attribute, modifier); + } |