Fixed a bug where the wrong backups where being deleted in rollback c…

…ommand
MehradN · Mar 5, 2023 · 18e23b5 · 18e23b5
1 parent 1779801
commit 18e23b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/ir/mehradn/rollback/event/RollbackCommand.java b/src/main/java/ir/mehradn/rollback/event/RollbackCommand.java
@@ -84,7 +84,7 @@ public static int deleteBackup(CommandContext<ServerCommandSource> context, int
         switch (position) {
             case 0 -> index = 0;
             case -1 -> index = -1;
-            default -> index = IntegerArgumentType.getInteger(context, "number") - 1;
+            default -> index = -IntegerArgumentType.getInteger(context, "number");
         }
 
         boolean f = backupManager.deleteBackup(worldName, index);

diff --git a/src/main/java/ir/mehradn/rollback/util/backup/BackupManager.java b/src/main/java/ir/mehradn/rollback/util/backup/BackupManager.java
@@ -195,10 +195,11 @@ public boolean createRollbackBackup(MinecraftServer server) {
     public boolean deleteBackup(String worldName, int index) {
         Rollback.LOGGER.info("Deleting the backup #{}...", index);
         JsonArray array = getWorldObject(worldName).getAsJsonArray("backups");
+
+        if (array.size() <= index || index < -array.size())
+            return true;
         if (index < 0)
             index += array.size();
-        if (index >= array.size())
-            return true;
 
         RollbackBackup backup = new RollbackBackup(worldName, array.get(index).getAsJsonObject());