From 329df8d33b232481444499ae979a84a4c53f1d7b Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sun, 17 Nov 2019 20:29:25 +0000 Subject: [PATCH] various minor Increase target size remove unnecessary brush sync send chunk on biome change --- .../fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java | 2 +- .../src/main/java/com/boydti/fawe/config/Settings.java | 2 +- .../java/com/sk89q/worldedit/command/tool/BrushTool.java | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java index a5829ec5b..7c7cbf470 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/BukkitGetBlocks_1_14.java @@ -453,7 +453,7 @@ public class BukkitGetBlocks_1_14 extends CharGetBlocks { // } Runnable callback; - if (bitMask == 0) { + if (bitMask == 0 && biomes == null) { callback = null; } else { int finalMask = bitMask; diff --git a/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java b/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java index c8df8d7c9..4b85d9084 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java @@ -275,7 +275,7 @@ public class Settings extends Config { " - A value too small may break some operations (deform?)" }) - public int TARGET_SIZE = 64; + public int TARGET_SIZE = 8192; @Comment({ "Force FAWE to start placing chunks regardless of whether an edit is finished processing", " - A larger value will use slightly less CPU time", diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java index ecd3216b1..243f2f77e 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BrushTool.java @@ -482,12 +482,7 @@ public class BrushTool implements DoubleActionTraceTool, ScrollTool, MovableTool Mask mask = traceMask == null ? new SolidBlockMask(editSession) : traceMask; new MaskTraverser(mask).reset(editSession); MaskedTargetBlock tb = new MaskedTargetBlock(mask, player, range, 0.2); - return TaskManager.IMP.sync(new RunnableVal() { - @Override - public void run(Vector3 value) { - this.value = tb.getMaskedTargetBlock(useLastBlock); - } - }); + return tb.getMaskedTargetBlock(useLastBlock); } public boolean act(BrushAction action, Player player, LocalSession session) {