From 0c1fdcc498086f6c8df7bc25b5c5794290528ee0 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 1 Nov 2019 22:56:07 +0100 Subject: [PATCH] remove broken debug --- .../src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java | 3 --- .../fawe/bukkit/adapter/mc1_14/test/TestChunkPacketSend.java | 5 ----- .../src/main/java/com/boydti/fawe/beta/IBlocks.java | 1 - .../fawe/beta/implementation/BatchProcessorHolder.java | 5 ++--- .../fawe/beta/implementation/IBatchProcessorHolder.java | 1 - .../boydti/fawe/beta/implementation/MultiBatchProcessor.java | 3 --- .../com/boydti/fawe/beta/implementation/NullProcessor.java | 1 - .../fawe/beta/implementation/SingleThreadQueueExtent.java | 4 ---- .../boydti/fawe/object/brush/visualization/VisualExtent.java | 2 -- .../java/com/sk89q/worldedit/command/RegionCommands.java | 1 - .../com/sk89q/worldedit/extent/AbstractDelegateExtent.java | 2 +- 11 files changed, 3 insertions(+), 25 deletions(-) diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java index e05c1c149..10f0f6722 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/FaweBukkit.java @@ -113,9 +113,6 @@ public class FaweBukkit implements IFawe, Listener { } catch (ClassNotFoundException e) { new ChunkListener_9(); } - - new TestChunkPacketSend(plugin); - }); } diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/test/TestChunkPacketSend.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/test/TestChunkPacketSend.java index d3dde69be..7d9be59dc 100644 --- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/test/TestChunkPacketSend.java +++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_14/test/TestChunkPacketSend.java @@ -22,17 +22,12 @@ public class TestChunkPacketSend { @Override public void onPacketSending(PacketEvent event) { if (event.getPacketType() != PacketType.Play.Server.MAP_CHUNK) { - System.out.println("Wrong packet"); return; } PacketContainer packet = event.getPacket(); StructureModifier bytes = packet.getBytes(); StructureModifier blockData = packet.getBlockData(); List values = blockData.getValues(); - System.out.println("Packet " + values.size() + " | " + blockData.size()); - System.out.println(bytes.size()); - System.out.println(packet.getByteArrays().size()); - System.out.println(packet.getBlocks().size()); } }); } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java index 974c01b62..1edbdf2a1 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/IBlocks.java @@ -39,7 +39,6 @@ public interface IBlocks extends Trimable { int mask = 0; for (int layer = 0; layer < FaweCache.IMP.CHUNK_LAYERS; layer++) { if (hasSection(layer)) { - System.out.println("Has layer 0 " + layer); mask += (1 << layer); } } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/BatchProcessorHolder.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/BatchProcessorHolder.java index c958385b3..e5469d224 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/BatchProcessorHolder.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/BatchProcessorHolder.java @@ -15,8 +15,6 @@ public class BatchProcessorHolder implements IBatchProcessorHolder { @Override public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) { - System.out.println("Process set"); - System.out.println(getProcessor()); return getProcessor().processSet(chunk, get, set); } @@ -27,6 +25,7 @@ public class BatchProcessorHolder implements IBatchProcessorHolder { @Override public String toString() { - return super.toString() + "{" + getProcessor() + "}"; + IBatchProcessor tmp = getProcessor(); + return super.toString() + "{" + (tmp == this ? "" : getProcessor()) + "}"; } } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/IBatchProcessorHolder.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/IBatchProcessorHolder.java index 62226e18a..6712c5ec4 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/IBatchProcessorHolder.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/IBatchProcessorHolder.java @@ -37,7 +37,6 @@ public interface IBatchProcessorHolder extends IBatchProcessor { @Override default IBatchProcessor join(IBatchProcessor other) { setProcessor(getProcessor().join(other)); - System.out.println("Join " + other + " | " + getProcessor()); return this; } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/MultiBatchProcessor.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/MultiBatchProcessor.java index a4b5de86a..43a2de9ce 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/MultiBatchProcessor.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/MultiBatchProcessor.java @@ -56,14 +56,11 @@ public class MultiBatchProcessor implements IBatchProcessor { @Override public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) { try { - System.out.println("Processes len " + this.processors.length); for (IBatchProcessor processor : this.processors) { set = processor.processSet(chunk, get, set); if (set == null) { - System.out.println("Return null " + processor.getClass()); return null; } - System.out.println("Process " + processor.getClass()); } return set; } catch (Throwable e) { diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/NullProcessor.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/NullProcessor.java index 2c3647e6c..18e9d6f37 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/NullProcessor.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/NullProcessor.java @@ -11,7 +11,6 @@ public enum NullProcessor implements IBatchProcessor { INSTANCE; @Override public IChunkSet processSet(IChunk chunk, IChunkGet get, IChunkSet set) { - System.out.println("Null process " + chunk.getX() + "," + chunk.getZ()); return null; } diff --git a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/SingleThreadQueueExtent.java b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/SingleThreadQueueExtent.java index f841bc969..e34b2f4b2 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/SingleThreadQueueExtent.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/SingleThreadQueueExtent.java @@ -89,8 +89,6 @@ public class SingleThreadQueueExtent extends BatchProcessorHolder implements IQu */ protected synchronized void reset() { if (!this.initialized) return; - System.out.println("Reset"); - new Exception().printStackTrace(); checkThread(); if (!this.chunks.isEmpty()) { for (IChunk chunk : this.chunks.values()) { @@ -130,7 +128,6 @@ public class SingleThreadQueueExtent extends BatchProcessorHolder implements IQu @Override public Extent addProcessor(IBatchProcessor processor) { join(processor); - System.out.println("Add processor " + this.getClass()); return this; } @@ -339,7 +336,6 @@ public class SingleThreadQueueExtent extends BatchProcessorHolder implements IQu chunks.clear(); } pollSubmissions(0, true); - System.out.println(submissions.size()); } @Override diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java index 360668fbe..d6f32fb43 100644 --- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java +++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VisualExtent.java @@ -47,7 +47,6 @@ public class VisualExtent extends AbstractDelegateExtent { @Override public Operation commit() { IQueueExtent queue = (IQueueExtent) getExtent(); - System.out.println("Send block updates"); return null; } @@ -59,7 +58,6 @@ public class VisualExtent extends AbstractDelegateExtent { public void clear() { IQueueExtent queue = (IQueueExtent) getExtent(); - System.out.println("Clear"); queue.cancel(); } } diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java index 46e02ef25..216734789 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/RegionCommands.java @@ -155,7 +155,6 @@ public class RegionCommands { editSession.addProcessor(new ChunkSendProcessor(world, () -> Stream.of(player))); editSession.addProcessor(NullProcessor.INSTANCE); editSession.setBlocks(region, pattern); - System.out.println("Done"); } @Command( diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java index 2e06e658d..bb2ee2019 100644 --- a/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java +++ b/worldedit-core/src/main/java/com/sk89q/worldedit/extent/AbstractDelegateExtent.java @@ -247,7 +247,7 @@ public class AbstractDelegateExtent implements Extent, LightingExtent { @Override public String toString() { - return super.toString() + ":" + extent.toString(); + return super.toString() + ":" + (extent == this ? "" : extent.toString()); } @Override