From 6c6f965ac79cbad84ca82e0287fa11723a0a6e62 Mon Sep 17 00:00:00 2001 From: Wizjany Date: Sat, 2 Mar 2013 21:55:06 -0500 Subject: [PATCH] Revert "Made //undo and //redo disregard global masks." This does nothing and neither did the original code. Disregard previous notice. This reverts commit cfb19eba9b5167ec1267791e5d8e8fe358acdc26. --- .../worldedit/commands/HistoryCommands.java | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java b/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java index 4855f9b9f..03346ac93 100644 --- a/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java +++ b/src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java @@ -23,7 +23,6 @@ import com.sk89q.minecraft.util.commands.Command; import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.worldedit.*; -import com.sk89q.worldedit.masks.Mask; /** * History little commands. @@ -47,12 +46,8 @@ public class HistoryCommands { @CommandPermissions("worldedit.history.undo") public void undo(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { - + int times = Math.max(1, args.getInteger(0, 1)); - - Mask mask = session.getMask(); - session.setMask(null); - for (int i = 0; i < times; ++i) { EditSession undone; if (args.argsLength() < 2) { @@ -66,7 +61,6 @@ public class HistoryCommands { } undone = sess.undo(session.getBlockBag(player), player); } - if (undone != null) { player.print("Undo successful."); we.flushBlockBag(player, undone); @@ -75,8 +69,6 @@ public class HistoryCommands { break; } } - - session.setMask(mask); } @Command( @@ -89,12 +81,9 @@ public class HistoryCommands { @CommandPermissions("worldedit.history.redo") public void redo(CommandContext args, LocalSession session, LocalPlayer player, EditSession editSession) throws WorldEditException { - + int times = Math.max(1, args.getInteger(0, 1)); - Mask mask = session.getMask(); - session.setMask(null); - for (int i = 0; i < times; ++i) { EditSession redone; if (args.argsLength() < 2) { @@ -108,7 +97,6 @@ public class HistoryCommands { } redone = sess.redo(session.getBlockBag(player), player); } - if (redone != null) { player.print("Redo successful."); we.flushBlockBag(player, redone); @@ -116,8 +104,6 @@ public class HistoryCommands { player.printError("Nothing left to redo."); } } - - session.setMask(mask); } @Command(