From 9bdac6db4d81ab868afd6007a0dcaa8328a840a8 Mon Sep 17 00:00:00 2001
From: Intelli <contact@intelli.software>
Date: Fri, 25 Feb 2022 16:33:41 -0700
Subject: [PATCH] Added entity counts to #preview confirmation page

---
 src/main/java/net/coreprotect/database/Rollback.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/java/net/coreprotect/database/Rollback.java b/src/main/java/net/coreprotect/database/Rollback.java
index 10dd2b6..995fd33 100644
--- a/src/main/java/net/coreprotect/database/Rollback.java
+++ b/src/main/java/net/coreprotect/database/Rollback.java
@@ -413,6 +413,9 @@ public class Rollback extends Queue {
                                         }
                                     }
                                 }
+                                else {
+                                    entityCount1++;
+                                }
                             }
                             else if (rowAction == 3) { // entity kill
                                 String world = Util.getWorldName(rowWorldId);
@@ -1488,7 +1491,7 @@ public class Rollback extends Queue {
                 modifiedData = modifiedData.append(Phrase.build(Phrase.AMOUNT_ITEM, NumberFormat.getInstance().format(blockCount), (blockCount == 1 ? Selector.FIRST : Selector.SECOND)));
                 modifyCount++;
             }
-            else if (preview == 0) {
+            else {
                 if (itemCount > 0 || actionList.contains(4)) {
                     modifiedData = modifiedData.append(Phrase.build(Phrase.AMOUNT_ITEM, NumberFormat.getInstance().format(itemCount), (itemCount == 1 ? Selector.FIRST : Selector.SECOND)));
                     modifyCount++;
@@ -1502,7 +1505,7 @@ public class Rollback extends Queue {
                     modifyCount++;
                 }
 
-                if (blockCount > 0 || !actionList.contains(4)) {
+                if (blockCount > 0 || !actionList.contains(4) || preview > 0) {
                     if (modifyCount > 0) {
                         modifiedData.append(", ");
                     }
@@ -1510,10 +1513,6 @@ public class Rollback extends Queue {
                     modifyCount++;
                 }
             }
-            else if (preview > 0) {
-                modifiedData = modifiedData.append(Phrase.build(Phrase.AMOUNT_BLOCK, NumberFormat.getInstance().format(blockCount), (blockCount == 1 ? Selector.FIRST : Selector.SECOND)));
-                modifyCount++;
-            }
 
             StringBuilder modifiedDataVerbose = new StringBuilder();
             if (verbose && preview == 0 && !actionList.contains(11)) {