From a32b4a1345ad5a3c028ced85a6d30b93a97ae0e9 Mon Sep 17 00:00:00 2001
From: N0tMyFaultOG <mc.cache@web.de>
Date: Fri, 13 Nov 2020 22:25:47 +0100
Subject: [PATCH] Fixed undo/redo not working from console/commandblock

65fbe09c35e9affa71d0ce7c20fa5ebd0f1c8365

Co-Authored-By: Matthew Miller <mnmiller1@me.com>
---
 .../worldedit/command/HistoryCommands.java    | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
index d5c5e7615..bac775360 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java
@@ -28,6 +28,7 @@ import com.sk89q.worldedit.command.util.CommandPermissionsConditionGenerator;
 import com.sk89q.worldedit.command.util.annotation.Confirm;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldedit.extent.inventory.BlockBag;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
 import org.enginehub.piston.annotation.Command;
@@ -60,7 +61,7 @@ public class HistoryCommands {
         desc = "Undoes the last action (from history)"
     )
     @CommandPermissions({"worldedit.history.undo", "worldedit.history.undo.self"})
-    public void undo(Player player, LocalSession session,
+    public void undo(Actor actor, LocalSession session,
                      @Confirm(Confirm.Processor.LIMIT) @Arg(desc = "Number of undoes to perform", def = "1")
                          int times,
                      @Arg(name = "player", desc = "Undo this player's operations", def = "")
@@ -68,31 +69,32 @@ public class HistoryCommands {
         times = Math.max(1, times);
         LocalSession undoSession = session;
         if (session.hasFastMode()) {
-            player.print(TranslatableComponent.of("fawe.worldedit.history.command.undo.disabled"));
+            actor.print(TranslatableComponent.of("fawe.worldedit.history.command.undo.disabled"));
             return;
         }
         if (playerName != null) {
-            player.checkPermission("worldedit.history.undo.other");
+            actor.checkPermission("worldedit.history.undo.other");
             undoSession = worldEdit.getSessionManager().findByName(playerName);
             if (undoSession == null) {
-                player.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName)));
+                actor.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName)));
                 return;
             }
         }
         int timesUndone = 0;
         for (int i = 0; i < times; ++i) {
-            EditSession undone = undoSession.undo(undoSession.getBlockBag(player), player);
+            BlockBag blockBag = actor instanceof Player ? undoSession.getBlockBag((Player) actor) : null;
+            EditSession undone = undoSession.undo(blockBag, actor);
             if (undone != null) {
                 timesUndone++;
-                worldEdit.flushBlockBag(player, undone);
+                worldEdit.flushBlockBag(actor, undone);
             } else {
                 break;
             }
         }
         if (timesUndone > 0) {
-            player.printInfo(TranslatableComponent.of("worldedit.undo.undone", TextComponent.of(timesUndone)));
+            actor.printInfo(TranslatableComponent.of("worldedit.undo.undone", TextComponent.of(timesUndone)));
         } else {
-            player.printError(TranslatableComponent.of("worldedit.undo.none"));
+            actor.printError(TranslatableComponent.of("worldedit.undo.none"));
         }
     }
 
@@ -102,7 +104,7 @@ public class HistoryCommands {
         desc = "Redoes the last action (from history)"
     )
     @CommandPermissions({"worldedit.history.redo", "worldedit.history.redo.self"})
-    public void redo(Player player, LocalSession session,
+    public void redo(Actor actor, LocalSession session,
                      @Confirm(Confirm.Processor.LIMIT) @Arg(desc = "Number of redoes to perform", def = "1")
                          int times,
                      @Arg(name = "player", desc = "Redo this player's operations", def = "")
@@ -110,27 +112,28 @@ public class HistoryCommands {
         times = Math.max(1, times);
         LocalSession redoSession = session;
         if (playerName != null) {
-            player.checkPermission("worldedit.history.redo.other");
+            actor.checkPermission("worldedit.history.redo.other");
             redoSession = worldEdit.getSessionManager().findByName(playerName);
             if (redoSession == null) {
-                player.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName)));
+                actor.printError(TranslatableComponent.of("worldedit.session.cant-find-session", TextComponent.of(playerName)));
                 return;
             }
         }
         int timesRedone = 0;
         for (int i = 0; i < times; ++i) {
-            EditSession redone = redoSession.redo(redoSession.getBlockBag(player), player);
+            BlockBag blockBag = actor instanceof Player ? redoSession.getBlockBag((Player) actor) : null;
+            EditSession redone = redoSession.redo(blockBag, actor);
             if (redone != null) {
                 timesRedone++;
-                worldEdit.flushBlockBag(player, redone);
+                worldEdit.flushBlockBag(actor, redone);
             } else {
                 break;
             }
         }
         if (timesRedone > 0) {
-            player.printInfo(TranslatableComponent.of("worldedit.redo.redone", TextComponent.of(timesRedone)));
+            actor.printInfo(TranslatableComponent.of("worldedit.redo.redone", TextComponent.of(timesRedone)));
         } else {
-            player.printError(TranslatableComponent.of("worldedit.redo.none"));
+            actor.printError(TranslatableComponent.of("worldedit.redo.none"));
         }
     }