From ce140a95c72e3a087c6498dcf9422906180c54aa Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sun, 28 Aug 2016 01:06:09 +1000 Subject: [PATCH] Fix rollback inspect + y-value byte overflow --- core/src/main/java/com/boydti/fawe/util/MainUtil.java | 4 +--- .../java/com/sk89q/worldedit/command/HistoryCommands.java | 2 ++ .../main/java/com/sk89q/worldedit/command/ToolCommands.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/com/boydti/fawe/util/MainUtil.java b/core/src/main/java/com/boydti/fawe/util/MainUtil.java index 7c9e27e8..2e111720 100644 --- a/core/src/main/java/com/boydti/fawe/util/MainUtil.java +++ b/core/src/main/java/com/boydti/fawe/util/MainUtil.java @@ -111,8 +111,7 @@ public class MainUtil { } } - public static long traverse(Path path, final RunnableVal2 onEach) { - final AtomicLong size = new AtomicLong(0); + public static void traverse(Path path, final RunnableVal2 onEach) { try { Files.walkFileTree(path, new SimpleFileVisitor() { @Override public FileVisitResult @@ -133,7 +132,6 @@ public class MainUtil { catch (IOException e) { throw new AssertionError ("walkFileTree will not throw IOException if the FileVisitor does not"); } - return size.get(); } public static File getFile(File base, String path) { diff --git a/core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java b/core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java index a0479322..5c550b35 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/HistoryCommands.java @@ -139,7 +139,9 @@ public class HistoryCommands { World world = player.getWorld(); WorldVector origin = player.getPosition(); Vector bot = origin.subtract(radius, radius, radius); + bot.setY(Math.max(0, bot.getY())); Vector top = origin.add(radius, radius, radius); + top.setY(Math.min(255, top.getY())); RollbackDatabase database = DBHandler.IMP.getDatabase(world); final AtomicInteger count = new AtomicInteger(); database.getPotentialEdits(other, System.currentTimeMillis() - timeDiff, bot, top, new RunnableVal() { diff --git a/core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java b/core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java index 0f809480..42965cac 100644 --- a/core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java +++ b/core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java @@ -52,7 +52,7 @@ public class ToolCommands { } @Command( - aliases = { "/inspect", "/i" }, + aliases = { "inspect", "i" }, usage = "", desc = "Inspect edits within a radius", help =