From cdb9abc1176813c0225b2f60133f2aaab76cf551 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Tue, 30 Jul 2019 07:44:19 +1000 Subject: [PATCH] 9a4473b73f3f5be9585a339c05912fef9868a0b9 --- .../fawe/bukkit/beta/BukkitChunkHolder.java | 4 ++-- .../com/boydti/fawe/beta/ChunkFilterBlock.java | 2 +- .../main/java/com/boydti/fawe/beta/Flood.java | 18 +++++++++--------- .../implementation/holder/ChunkHolder.java | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitChunkHolder.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitChunkHolder.java index ccdd3da81..64c0fdc87 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitChunkHolder.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/beta/BukkitChunkHolder.java @@ -41,8 +41,8 @@ import java.util.concurrent.Future; public class BukkitChunkHolder> extends ChunkHolder { @Override - public void init(final IQueueExtent extent, final int x, final int z) { - super.init(extent, x, z); + public void init(final IQueueExtent extent, final int chunkX, final int chunkZ) { + super.init(extent, chunkX, chunkZ); } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/ChunkFilterBlock.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/ChunkFilterBlock.java index f34d6a3a6..2e0de38c4 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/ChunkFilterBlock.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/ChunkFilterBlock.java @@ -8,7 +8,7 @@ public abstract class ChunkFilterBlock extends SimpleFilterBlock { super(extent); } - public abstract ChunkFilterBlock init(int x, int z, IChunkGet chunk); + public abstract ChunkFilterBlock init(int chunkX, int chunkZ, IChunkGet chunk); public abstract ChunkFilterBlock init(final IChunkGet iget, final IChunkSet iset, final int layer); diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/Flood.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/Flood.java index e8773e5c5..377edfa34 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/Flood.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/Flood.java @@ -20,9 +20,9 @@ public class Flood { private int[][] queues; private long[][] visits; - private int x; - private int y; - private int z; + private int chunkX; + private int chunkYLayer; + private int chunkZ; private ConcurrentLinkedQueue queuePool = new ConcurrentLinkedQueue<>(); private final Long2ObjectLinkedOpenHashMap chunkVisits; @@ -52,10 +52,10 @@ public class Flood { } } - private void init(int x, int y, int z) { - this.x = x; - this.y = y; - this.z = z; + private void init(int chunkX, int chunkYLayer, int chunkZ) { + this.chunkX = chunkX; + this.chunkYLayer = chunkYLayer; + this.chunkZ = chunkZ; } public void start(int x, int y, int z) { @@ -154,8 +154,8 @@ public class Flood { visit = visits[sectionIndex]; queue = queues[sectionIndex]; if (visit == null || queue == null) { - long pair = MathMan.pairInt(this.x + nextX, this.z + nextZ); - int layer = this.y + nextY; + long pair = MathMan.pairInt(this.chunkX + nextX, this.chunkZ + nextZ); + int layer = this.chunkYLayer + nextY; if (layer < 0 || layer > 15) { continue; } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/holder/ChunkHolder.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/holder/ChunkHolder.java index dd889fd80..2e8c320cb 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/holder/ChunkHolder.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/holder/ChunkHolder.java @@ -28,8 +28,8 @@ public abstract class ChunkHolder implements IChunk, Supplier { private IChunkSet set; private IBlockDelegate delegate; private IQueueExtent extent; - private int x; - private int z; + private int chunkX; + private int chunkZ; public ChunkHolder() { this.delegate = NULL; @@ -62,7 +62,7 @@ public abstract class ChunkHolder implements IChunk, Supplier { if (region != null) { region.filter(this, filter, block, get, set); } else { - block = block.init(x, z, get); + block = block.init(chunkX, chunkZ, get); for (int layer = 0; layer < 16; layer++) { if (!get.hasSection(layer) || !filter.appliesLayer(this, layer)) continue; block.init(get, set, layer); @@ -119,7 +119,7 @@ public abstract class ChunkHolder implements IChunk, Supplier { private IChunkGet newGet() { if (extent instanceof SingleThreadQueueExtent) { - IChunkGet newGet = extent.getCachedGet(x, z, this); + IChunkGet newGet = extent.getCachedGet(chunkX, chunkZ, this); if (newGet != null) { return newGet; } @@ -128,10 +128,10 @@ public abstract class ChunkHolder implements IChunk, Supplier { } @Override - public void init(final IQueueExtent extent, final int x, final int z) { + public void init(final IQueueExtent extent, final int chunkX, final int chunkZ) { this.extent = extent; - this.x = x; - this.z = z; + this.chunkX = chunkX; + this.chunkZ = chunkZ; if (set != null) { set.reset(); delegate = SET; @@ -147,12 +147,12 @@ public abstract class ChunkHolder implements IChunk, Supplier { @Override public int getX() { - return x; + return chunkX; } @Override public int getZ() { - return z; + return chunkZ; } @Override