Fixed NotSerializableException when logging items containing attribut…

…e data
PlayPro · Dec 9, 2024 · b3db65d · b3db65d
1 parent f729c8a
commit b3db65d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/src/main/java/net/coreprotect/database/rollback/RollbackUtil.java b/src/main/java/net/coreprotect/database/rollback/RollbackUtil.java
@@ -346,10 +346,17 @@ else if (mapData.get("modifiers") != null) {
                     List<Object> modifiers = (List<Object>) mapData.get("modifiers");
 
                     for (Object item : modifiers) {
-                        Map<Attribute, Map<String, Object>> modifiersMap = (Map<Attribute, Map<String, Object>>) item;
-                        for (Map.Entry<Attribute, Map<String, Object>> entry : modifiersMap.entrySet()) {
+                        Map<Object, Map<String, Object>> modifiersMap = (Map<Object, Map<String, Object>>) item;
+                        for (Map.Entry<Object, Map<String, Object>> entry : modifiersMap.entrySet()) {
                             try {
-                                Attribute attribute = entry.getKey();
+                                Attribute attribute = null;
+                                if (entry.getKey() instanceof Attribute) {
+                                    attribute = (Attribute) entry.getKey();
+                                }
+                                else {
+                                    attribute = (Attribute) BukkitAdapter.ADAPTER.getRegistryValue((String) entry.getKey(), Attribute.class);
+                                }
+
                                 AttributeModifier modifier = AttributeModifier.deserialize(entry.getValue());
                                 itemMeta.addAttributeModifier(attribute, modifier);
                             }

diff --git a/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java b/src/main/java/net/coreprotect/utility/serialize/ItemMetaHandler.java
@@ -125,12 +125,12 @@ public static List<List<Map<String, Object>>> serialize(ItemStack item, Material
 
             if (itemMeta.hasAttributeModifiers()) {
                 for (Map.Entry<Attribute, AttributeModifier> entry : itemMeta.getAttributeModifiers().entries()) {
-                    Map<Attribute, Map<String, Object>> attributeList = new HashMap<>();
+                    Map<Object, Map<String, Object>> attributeList = new HashMap<>();
                     Attribute attribute = entry.getKey();
                     AttributeModifier modifier = entry.getValue();
 
                     itemMeta.removeAttributeModifier(attribute, modifier);
-                    attributeList.put(attribute, modifier.serialize());
+                    attributeList.put(BukkitAdapter.ADAPTER.getRegistryKey(attribute), modifier.serialize());
                     modifiers.add(attributeList);
                 }
             }