aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0976-Fix-equipment-slot-and-group-API.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-07-16 11:36:07 -0700
committerGitHub <[email protected]>2024-07-16 11:36:07 -0700
commita6ceda12c54cd8b7d272fe50e744c9b9a26d0838 (patch)
tree27cabb5cf6b9dc94333be0281617d76d44a8daf7 /patches/server/0976-Fix-equipment-slot-and-group-API.patch
parentef96a69e84e20e5440227e974136c18501c5895b (diff)
downloadPaper-a6ceda12c54cd8b7d272fe50e744c9b9a26d0838.tar.gz
Paper-a6ceda12c54cd8b7d272fe50e744c9b9a26d0838.zip
distinguish between null and empty map in API (#10829)
Diffstat (limited to 'patches/server/0976-Fix-equipment-slot-and-group-API.patch')
-rw-r--r--patches/server/0976-Fix-equipment-slot-and-group-API.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0976-Fix-equipment-slot-and-group-API.patch b/patches/server/0976-Fix-equipment-slot-and-group-API.patch
index 12c1d026ea..f8ca8d1bab 100644
--- a/patches/server/0976-Fix-equipment-slot-and-group-API.patch
+++ b/patches/server/0976-Fix-equipment-slot-and-group-API.patch
@@ -52,7 +52,7 @@ index 9d74577af071954e1e37201a96368c1360076209..eafa54c870c3e2aef30c3f9f96f51660
throw new IllegalArgumentException("Not implemented. This is a bug");
}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 776f4dcc0b61a5b8ee4020a283cfcfacefbe682e..9aef0223cd790d9f4a74dfe22e7926027c08dca5 100644
+index 20d0ca163242bb58369f0709f452ad3995dd8018..1ea7597b5e0f38789a9f8bdf83c3ac35ae19164f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -1452,7 +1452,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -64,7 +64,7 @@ index 776f4dcc0b61a5b8ee4020a283cfcfacefbe682e..9aef0223cd790d9f4a74dfe22e792602
result.put(entry.getKey(), entry.getValue());
}
}
-@@ -1520,9 +1520,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1526,9 +1526,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
while (iter.hasNext()) {
Map.Entry<Attribute, AttributeModifier> entry = iter.next();