Set clipboard after regen to prevent unnecessary clipboard loss on fa…

…ilure (#2503) * Set clipboard after regen to prevent unnecessary clipboard loss on failure * Remove the cast
EngineHub · Apr 4, 2024 · 79a06b1 · 79a06b1
1 parent 177e70d
commit 79a06b1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java
@@ -459,13 +459,16 @@ void regenerate(Actor actor, World world, LocalSession session, EditSession edit
                 .regenBiomes(regenBiomes)
                 .build();
             Extent outputExtent = editSession;
+            BlockArrayClipboard clipboard = null;
             if (toClipboard) {
-                var clipboard = new BlockArrayClipboard(region);
+                clipboard = new BlockArrayClipboard(region);
                 clipboard.setOrigin(session.getPlacementPosition(actor));
-                session.setClipboard(new ClipboardHolder(clipboard));
                 outputExtent = clipboard;
             }
             success = world.regenerate(region, outputExtent, options);
+            if (success && toClipboard) {
+                session.setClipboard(new ClipboardHolder(clipboard));
+            }
         } finally {
             session.setMask(mask);
         }