Add OMINOUS_ITEM_SPAWNER SpawnReason (#10897)

1 files changed, 19 insertions, 0 deletions

diff --git a/patches/server/0916-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch b/patches/server/0916-Fix-CraftMetaItem-getAttributeModifier-duplication-c.patch
new file mode 100644
index 0000000000..ad38c13cd7
--- /dev/null
+++ b/patches/server/0916-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 0b87cfbdf039ee5bc017d2b1783c7c4853047952..5a455354561389194b0e61c03f4b2e9285b17a3b 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -1405,7 +1405,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);
+     }