Paper-Old/patches/server/0900-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: hyper1423 <backup8822@gmail.com>
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 43d1f278a56ff344ddf4e5d70471485b393a3b1d..2948fc39ad2f65739dea6b8256112b85ea755340 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -1666,7 +1666,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().getKey().equals(modifier.getKey()), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier);
+            Preconditions.checkArgument(!(entry.getValue().getKey().equals(modifier.getKey()) && entry.getKey() == attribute), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier); // Paper - attribute modifiers with same namespaced key but on different attributes are fine
         }
         return this.attributeModifiers.put(attribute, modifier);
     }
Fix CraftMetaItem#addAttributeModifier duplication check (#9995) 2023-12-03 01:59:13 +01:00			`From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001`
			`From: hyper1423 <backup8822@gmail.com>`
			`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`
Rework async chunk api implementation Firstly, the old methods all routed to the CompletableFuture method. However, the CF method could not guarantee that if the caller was off-main that the future would be "completed" on-main. Since the callback methods used the CF one, this meant that the callback methods did not guarantee that the callbacks were to be called on the main thread. Now, all methods route to getChunkAtAsync(x, z, gen, urgent, cb) so that the methods with the callback are guaranteed to invoke the callback on the main thread. The CF behavior remains unchanged; it may still appear to complete on main if invoked off-main. Secondly, remove the scheduleOnMain invocation in the async chunk completion. This unnecessarily delays the callback by 1 tick. Thirdly, add getChunksAtAsync(minX, minZ, maxX, maxZ, ...) which will load chunks within an area. This method is provided as a helper as keeping all chunks loaded within an area can be complicated to implement for plugins (due to the lacking ticket API), and is already implemented internally anyways. Fourthly, remove the ticket addition that occured with getChunkAt and getChunkAtAsync. The ticket addition may delay the unloading of the chunk unnecessarily. It also fixes a very rare timing bug where the future/callback would be completed after the chunk unloads. 2024-11-19 07:34:32 +01:00			`index 43d1f278a56ff344ddf4e5d70471485b393a3b1d..2948fc39ad2f65739dea6b8256112b85ea755340 100644`
Fix CraftMetaItem#addAttributeModifier duplication check (#9995) 2023-12-03 01:59:13 +01:00			`--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java`
			`+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java`
Patch me this, patch me that 2024-10-24 12:11:32 +02:00			`@@ -1666,7 +1666,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {`
Fix CraftMetaItem#addAttributeModifier duplication check (#9995) 2023-12-03 01:59:13 +01:00			`Preconditions.checkNotNull(modifier, "AttributeModifier cannot be null");`
			`this.checkAttributeList();`
			`for (Map.Entry<Attribute, AttributeModifier> entry : this.attributeModifiers.entries()) {`
922 2024-06-14 10:17:11 +02:00			`- Preconditions.checkArgument(!entry.getValue().getKey().equals(modifier.getKey()), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier);`
Correct duplicate attribute check (#10901) Brackets got lost during the update, leading to an incorrect precondition call. 2024-06-18 11:11:14 +02:00			`+ Preconditions.checkArgument(!(entry.getValue().getKey().equals(modifier.getKey()) && entry.getKey() == attribute), "Cannot register AttributeModifier. Modifier is already applied! %s", modifier); // Paper - attribute modifiers with same namespaced key but on different attributes are fine`
Fix CraftMetaItem#addAttributeModifier duplication check (#9995) 2023-12-03 01:59:13 +01:00			`}`
			`return this.attributeModifiers.put(attribute, modifier);`
			`}`