aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch')
-rw-r--r--patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1035-handle-converting-old-serialized-names-to-new-names.patch
new file mode 100644
index 0000000000..0f14e72527
--- /dev/null
+++ b/patches/server/1035-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 bf0870590fcf5c502cd986047efec9f754faf9a7..ee760d45c8e95c4f5a973254da7531d355aa5fee 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+@@ -490,7 +490,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
+@@ -661,7 +661,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());
+ }
+@@ -695,7 +695,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;
+ }