Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-23 17:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Made //undo and //redo disregard global masks."

Browse Source 
This does nothing and neither did the original code. Disregard previous notice.
This reverts commit cfb19eba9b.
This commit is contained in:
Wizjany 2013-03-02 21:55:06 -05:00
parent 7eac40c6e7
commit 6c6f965ac7
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sk89q/worldedit/commands/HistoryCommands.java
View File

@ -23,7 +23,6 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext; import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandPermissions; import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.worldedit.*; import com.sk89q.worldedit.*;
import com.sk89q.worldedit.masks.Mask;
/** /**
* History little commands. * History little commands.
@ -47,12 +46,8 @@ public class HistoryCommands {
@CommandPermissions("worldedit.history.undo") @CommandPermissions("worldedit.history.undo")
public void undo(CommandContext args, LocalSession session, LocalPlayer player, public void undo(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
int times = Math.max(1, args.getInteger(0, 1)); int times = Math.max(1, args.getInteger(0, 1));
Mask mask = session.getMask();
session.setMask(null);
for (int i = 0; i < times; ++i) { for (int i = 0; i < times; ++i) {
EditSession undone; EditSession undone;
if (args.argsLength() < 2) { if (args.argsLength() < 2) {
@ -66,7 +61,6 @@ public class HistoryCommands {
} }
undone = sess.undo(session.getBlockBag(player), player); undone = sess.undo(session.getBlockBag(player), player);
} }
if (undone != null) { if (undone != null) {
player.print("Undo successful."); player.print("Undo successful.");
we.flushBlockBag(player, undone); we.flushBlockBag(player, undone);
@ -75,8 +69,6 @@ public class HistoryCommands {
break; break;
} }
} }
session.setMask(mask);
} }
@Command( @Command(
@ -89,12 +81,9 @@ public class HistoryCommands {
@CommandPermissions("worldedit.history.redo") @CommandPermissions("worldedit.history.redo")
public void redo(CommandContext args, LocalSession session, LocalPlayer player, public void redo(CommandContext args, LocalSession session, LocalPlayer player,
EditSession editSession) throws WorldEditException { EditSession editSession) throws WorldEditException {
int times = Math.max(1, args.getInteger(0, 1)); int times = Math.max(1, args.getInteger(0, 1));
Mask mask = session.getMask();
session.setMask(null);
for (int i = 0; i < times; ++i) { for (int i = 0; i < times; ++i) {
EditSession redone; EditSession redone;
if (args.argsLength() < 2) { if (args.argsLength() < 2) {
@ -108,7 +97,6 @@ public class HistoryCommands {
} }
redone = sess.redo(session.getBlockBag(player), player); redone = sess.redo(session.getBlockBag(player), player);
} }
if (redone != null) { if (redone != null) {
player.print("Redo successful."); player.print("Redo successful.");
we.flushBlockBag(player, redone); we.flushBlockBag(player, redone);
@ -116,8 +104,6 @@ public class HistoryCommands {
player.printError("Nothing left to redo."); player.printError("Nothing left to redo.");
} }
} }
session.setMask(mask);
} }
@Command( @Command(