SPIGOT-7857: Improve ItemMeta block data deserialization

PaperMC · Aug 7, 2024 · 8ee6fd1 · 8ee6fd1
1 parent 8f26c30
commit 8ee6fd1
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -519,9 +519,16 @@ static Multimap<Attribute, AttributeModifier> buildModifiers(ItemAttributeModifi
         if (blockData != null) {
             Map<String, String> mapBlockData = new HashMap<>();
 
-            NBTTagCompound nbtBlockData = (NBTTagCompound) CraftNBTTagConfigSerializer.deserialize(blockData);
-            for (String key : nbtBlockData.getAllKeys()) {
-                mapBlockData.put(key, nbtBlockData.getString(key));
+            if (blockData instanceof Map) {
+                for (Entry<?, ?> entry : ((Map<?, ?>) blockData).entrySet()) {
+                    mapBlockData.put(entry.getKey().toString(), entry.getValue().toString());
+                }
+            } else {
+                // Legacy pre 1.20.5:
+                NBTTagCompound nbtBlockData = (NBTTagCompound) CraftNBTTagConfigSerializer.deserialize(blockData);
+                for (String key : nbtBlockData.getAllKeys()) {
+                    mapBlockData.put(key, nbtBlockData.getString(key));
+                }
             }
 
             this.blockData = mapBlockData;