diff options
| author | Jake Potrebic <[email protected]> | 2024-04-26 11:39:20 -0700 |
|---|---|---|
| committer | Jake Potrebic <[email protected]> | 2024-04-26 11:39:20 -0700 |
| commit | 44e68c301a66443d6af95a832792a9d25f873b0b (patch) | |
| tree | 8d3f3c3d646f702a797853ef4868ff7c8d2d8b5a /patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch | |
| parent | cc81668863edd8ed6b382a59dd6fc002df14dea9 (diff) | |
| download | Paper-44e68c301a66443d6af95a832792a9d25f873b0b.tar.gz Paper-44e68c301a66443d6af95a832792a9d25f873b0b.zip | |
fix some more issues
Diffstat (limited to 'patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch')
| -rw-r--r-- | patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch b/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch new file mode 100644 index 0000000000..50366dacd0 --- /dev/null +++ b/patches/server/1037-handle-converting-old-serialized-names-to-new-names.patch @@ -0,0 +1,32 @@ +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..dabbdadf3824d1132bd4aa6d2f2360c270fa299a 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +@@ -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()); + } +diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +index a6d2370113eb44c0863b7837362dbb350f5057c6..21dbce78b1a0d42d20c9e7f87f8bee1c18c1353f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java ++++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSpawnEgg.java +@@ -138,7 +138,7 @@ public class CraftMetaSpawnEgg extends CraftMetaItem implements SpawnEggMeta { + + String entityType = SerializableMeta.getString(map, CraftMetaSpawnEgg.ENTITY_ID.BUKKIT, true); + if (entityType != null) { +- this.spawnedType = EntityType.fromName(entityType); ++ this.spawnedType = EntityType.fromName(org.bukkit.craftbukkit.legacy.FieldRename.convertEntityTypeName(org.bukkit.craftbukkit.util.ApiVersion.CURRENT, entityType)); // Paper - handle old entity type field names + } + } + |