Fixup container rollbacks

Author: Warriorrrr

src/main/java/net/coreprotect/command/RollbackRestoreCommand.java

@@ -424,7 +424,7 @@ else if (action == 0) {
                                                 Chat.sendMessage(player2, Color.DARK_AQUA + "CoreProtect " + Color.WHITE + "- " + Phrase.build(Phrase.ROLLBACK_STARTED, users, Selector.SECOND));
                                             }
 
-                                            if (finalArgAction.contains(5) || finalArgAction.contains(4)) {
+                                            if (finalArgAction.contains(5)) {
                                                 ContainerRollback.performContainerRollbackRestore(statement, player2, uuidList, rollbackusers2, rtime, blist, elist, euserlist, finalArgAction, location, radius, finalTimeStart, finalTimeEnd, restrictWorld, false, verbose, action);
                                             }
                                             else {

src/main/java/net/coreprotect/database/logger/ContainerLogger.java

@@ -224,11 +224,7 @@ protected static void logTransaction(PreparedStatement preparedStmt, int batchCo
                             return;
                         }
 
-                        // slot is only relevant when face data is set
-                        String itemData = null;
-                        if ((faceData != null && !faceData.isEmpty()) || ItemUtils.hasNonTrivialData(item)) {
-                            itemData = ItemUtils.serializeItem(item, slot, ItemUtils.parseBlockFaceOrNull(faceData));
-                        }
+                        String itemData = ItemUtils.serializeItem(item, slot, ItemUtils.parseBlockFaceOrNull(faceData));
 
                         int userId = UserStatement.getId(preparedStmt, event.getUser(), true);
                         Location eventLocation = event.getLocation();

src/main/java/net/coreprotect/database/rollback/Rollback.java

@@ -50,10 +50,6 @@ public static LookupResult<?> performRollbackRestore(Statement statement, Comman
                 rawLookupResult = Lookup.performLookup(statement, user, checkUuids, checkUsers, restrictList, excludeList, excludeUserList, actionList, location, radius, null, startTime, endTime, -1, -1, restrictWorld, lookup, false);
             }
 
-            if (!(rawLookupResult instanceof final CommonLookupResult lookupResult)) {
-                return null;
-            }
-
             boolean ROLLBACK_ITEMS = false;
             List<Object> itemRestrictList = new ArrayList<>(restrictList);
             Map<Object, Boolean> itemExcludeList = new HashMap<>(excludeList);
@@ -89,6 +85,10 @@ public static LookupResult<?> performRollbackRestore(Statement statement, Comman
                 }
             }
 
+            if (!(rawLookupResult instanceof CommonLookupResult) && itemLookupResult == null) {
+                return null;
+            }
+
             LinkedHashSet<Integer> worldList = new LinkedHashSet<>();
             TreeMap<Long, Integer> chunkList = new TreeMap<>();
             Map<Integer, Map<Long, List<CommonLookupData>>> dataList = new HashMap<>();
@@ -101,7 +101,7 @@ public static LookupResult<?> performRollbackRestore(Statement statement, Comman
 
             int listC = 0;
             while (listC < 2) {
-                List<CommonLookupData> scanList = lookupResult.data();
+                List<CommonLookupData> scanList = rawLookupResult != null ? ((CommonLookupResult) rawLookupResult).data() : List.of(); // rawLookupResult can be null while upstream just handles it as an empty list
 
                 if (listC == 1 && itemLookupResult != null) {
                     scanList = itemLookupResult.data();
@@ -211,7 +211,7 @@ public static LookupResult<?> performRollbackRestore(Statement statement, Comman
                     Queue.queueRollbackUpdate(userString, blockList, Process.BLOCK_INVENTORY_ROLLBACK_UPDATE, rollbackType);
                 }
                 else {
-                    Queue.queueRollbackUpdate(userString, lookupResult.data(), Process.ROLLBACK_UPDATE, rollbackType);
+                    Queue.queueRollbackUpdate(userString, rawLookupResult instanceof CommonLookupResult lookupResult ? lookupResult.data() : null, Process.ROLLBACK_UPDATE, rollbackType);
                     Queue.queueRollbackUpdate(userString, itemLookupResult != null ? itemLookupResult.data() : null, Process.CONTAINER_ROLLBACK_UPDATE, rollbackType);
                 }
             }

src/main/java/net/coreprotect/utility/ItemUtils.java

@@ -517,7 +517,7 @@ public static String serializeItem(@NonNull ItemStack itemStack, int slot, Block
             itemStack.setAmount(99);
         }
 
-        final JsonObject object = Bukkit.getUnsafe().serializeItemAsJson(itemStack);
+        final JsonObject object = hasNonTrivialData(itemStack) ? Bukkit.getUnsafe().serializeItemAsJson(itemStack) : new JsonObject();
 
         if (slot >= 0) {
             object.addProperty("co_slot", slot);
@@ -564,7 +564,7 @@ public static SerializedItem deserializeItem(@Nullable String itemString, @Nulla
         }
 
         if (!object.has("DataVersion")) {
-            // not an item
+            // not an item, or just not saved fully due to not having any special data
             return type != null && amount > 0 && type.isItem() ? new SerializedItem(ItemStack.of(type, Math.min(amount, 99)), slot, faceData) : null;
         }