From 52024b4c2e6709c761ffcb742200b4bf61e2d555 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 21 Jun 2016 17:03:43 +1000 Subject: [PATCH] Compression tweak --- .../com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java | 4 ++-- .../com/sk89q/worldedit/regions/CuboidRegion.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java b/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java index 0d1cb7a9..8e83390b 100644 --- a/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java +++ b/bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitMain_110.java @@ -9,7 +9,7 @@ import com.sk89q.worldedit.EditSession; public class BukkitMain_110 extends ABukkitMain { @Override public BukkitQueue_0 getQueue(String world) { - return new com.boydti.fawe.bukkit.v1_10.BukkitQueue_1_10(world); + return new BukkitQueue_1_10(world); // return new BukkitQueue_All(world); } @@ -17,4 +17,4 @@ public class BukkitMain_110 extends ABukkitMain { public EditSessionWrapper getEditSessionWrapper(EditSession session) { return new BukkitEditSessionWrapper_0(session); } -} +} \ No newline at end of file diff --git a/core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java b/core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java index 4dd4d125..b6adf668 100644 --- a/core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java +++ b/core/src/main/java/com/sk89q/worldedit/regions/CuboidRegion.java @@ -19,14 +19,19 @@ package com.sk89q.worldedit.regions; -import com.sk89q.worldedit.*; +import com.boydti.fawe.config.Settings; +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.BlockVector2D; +import com.sk89q.worldedit.LocalWorld; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldedit.Vector2D; import com.sk89q.worldedit.world.World; import com.sk89q.worldedit.world.storage.ChunkStore; - import java.util.HashSet; import java.util.Iterator; import java.util.Set; + import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; @@ -343,6 +348,9 @@ public class CuboidRegion extends AbstractRegion implements FlatRegion { @Override public Iterator iterator() { + if (Settings.COMPRESSION_LEVEL == 9) { + return iterator_old(); + } final BlockVector v = new BlockVector(0,0,0); return new Iterator() { private Vector min = getMinimumPoint();