From 56f5c046198c7a2871ca7d7423d6ced4e4892f87 Mon Sep 17 00:00:00 2001
From: Intelli <contact@intelli.software>
Date: Fri, 7 Mar 2025 15:06:13 -0700
Subject: [PATCH] Fixed rollback item metadata handling

---
 .../rollback/RollbackItemHandler.java         | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/main/java/net/coreprotect/database/rollback/RollbackItemHandler.java b/src/main/java/net/coreprotect/database/rollback/RollbackItemHandler.java
index 5e50022..3c11ee1 100644
--- a/src/main/java/net/coreprotect/database/rollback/RollbackItemHandler.java
+++ b/src/main/java/net/coreprotect/database/rollback/RollbackItemHandler.java
@@ -22,36 +22,22 @@ public class RollbackItemHandler {
      * @return Object array containing [slot, facing, itemstack]
      */
     public static Object[] populateItemStack(ItemStack itemstack, byte[] metadata) {
-        int slot = 0;
-        String face = "";
-
         if (metadata != null) {
             try {
                 ByteArrayInputStream metaByteStream = new ByteArrayInputStream(metadata);
                 BukkitObjectInputStream metaObjectStream = new BukkitObjectInputStream(metaByteStream);
-                @SuppressWarnings("unchecked")
-                List<Object> meta = (List<Object>) metaObjectStream.readObject();
+                Object metaList = metaObjectStream.readObject();
                 metaObjectStream.close();
                 metaByteStream.close();
 
-                for (Object value : meta) {
-                    if (value instanceof Integer) {
-                        slot = (Integer) value;
-                    }
-                    else if (value instanceof ItemStack) {
-                        itemstack = (ItemStack) value;
-                    }
-                    else if (value instanceof String) {
-                        face = (String) value;
-                    }
-                }
+                return RollbackUtil.populateItemStack(itemstack, metaList);
             }
             catch (Exception e) {
                 e.printStackTrace();
             }
         }
 
-        return new Object[] { slot, face, itemstack };
+        return new Object[] { 0, "", itemstack };
     }
 
     /**