1.20.6 (#10623)

1 files changed, 37 insertions, 0 deletions

diff --git a/patches/server/1031-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1031-handle-converting-old-serialized-names-to-new-names.patch
new file mode 100644
index 0000000000..beb171fe27
--- /dev/null
+++ b/patches/server/1031-handle-converting-old-serialized-names-to-new-names.patch
@@ -0,0 +1,37 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 26 Apr 2024 11:38:40 -0700
+Subject: [PATCH] handle converting old serialized names to new names
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+index 72f60a1308d93eefe73ab8a5a509c08d3ddd1521..cfb40d9bf093a83c8ae38ffe5c1d17f79528e0c3 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -494,7 +494,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+             for (Object hideFlagObject : hideFlags) {
+                 String hideFlagString = (String) hideFlagObject;
+                 try {
+-                    ItemFlag hideFlatEnum = ItemFlag.valueOf(hideFlagString);
++                    ItemFlag hideFlatEnum = ItemFlag.valueOf(org.bukkit.craftbukkit.legacy.FieldRename.convertItemFlagName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, hideFlagString)); // Paper - handle old field names
+                     this.addItemFlags(hideFlatEnum);
+                 } catch (IllegalArgumentException ex) {
+                     // Ignore when we got a old String which does not map to a Enum value anymore
+@@ -663,7 +663,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                 enchantKey = "SWEEPING_EDGE";
+             }
+ 
+-            Enchantment enchantment = Enchantment.getByName(enchantKey);
++            Enchantment enchantment = Enchantment.getByName(org.bukkit.craftbukkit.legacy.FieldRename.convertEnchantmentName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, enchantKey)); // Paper - convert enchantment names
+             if ((enchantment != null) && (entry.getValue() instanceof Integer)) {
+                 enchantments.put(enchantment, (Integer) entry.getValue());
+             }
+@@ -697,7 +697,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+                     continue;
+                 }
+                 AttributeModifier modifier = (AttributeModifier) o;
+-                Attribute attribute = EnumUtils.getEnum(Attribute.class, attributeName.toUpperCase(Locale.ROOT));
++                Attribute attribute = EnumUtils.getEnum(Attribute.class, org.bukkit.craftbukkit.legacy.FieldRename.convertAttributeName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, attributeName.toUpperCase(Locale.ROOT))); // Paper - handle old field names
+                 if (attribute == null) {
+                     continue;
+                 }