From 0bac7251c10bcbb8e4c338379ee23b0eb2cbb2e7 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sun, 12 Nov 2017 11:42:19 +1100 Subject: [PATCH] Remove debug + Sync sponge tile changes --- bukkit/src/main/resources/plugin.yml | 2 +- .../clipboard/DiskOptimizedClipboard.java | 1 - .../fawe/sponge/v1_12/SpongeChunk_1_12.java | 32 ++++++++++-------- .../fawe/sponge/v1_11/SpongeChunk_1_11.java | 33 ++++++++++--------- 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 2e61da0c..398ff8e4 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -49,7 +49,7 @@ permissions: worldedit.clipboard.rotate: true worldedit.help: true worldedit.global-mask: true - worldedit.global-trasnform: true + worldedit.global-transform: true worldedit.generation.cylinder: true worldedit.generation.sphere: true worldedit.generation.forest: true diff --git a/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java b/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java index 8ee7baa1..3e117577 100644 --- a/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java +++ b/core/src/main/java/com/boydti/fawe/object/clipboard/DiskOptimizedClipboard.java @@ -284,7 +284,6 @@ public class DiskOptimizedClipboard extends FaweClipboard implements Closeable { @Override public void close() { - MainUtil.stacktrace(); try { if (mbb != null) { mbb.force(); diff --git a/sponge/src/main/java/com/boydti/fawe/sponge/v1_12/SpongeChunk_1_12.java b/sponge/src/main/java/com/boydti/fawe/sponge/v1_12/SpongeChunk_1_12.java index eb848c08..3659c22c 100644 --- a/sponge/src/main/java/com/boydti/fawe/sponge/v1_12/SpongeChunk_1_12.java +++ b/sponge/src/main/java/com/boydti/fawe/sponge/v1_12/SpongeChunk_1_12.java @@ -381,20 +381,24 @@ public class SpongeChunk_1_12 extends CharFaweChunk { // Set tiles Map tilesToSpawn = this.getTiles(); - for (Map.Entry entry : tilesToSpawn.entrySet()) { - CompoundTag nativeTag = entry.getValue(); - short blockHash = entry.getKey(); - int x = (blockHash >> 12 & 0xF) + bx; - int y = (blockHash & 0xFF); - int z = (blockHash >> 8 & 0xF) + bz; - BlockPos pos = new BlockPos(x, y, z); // Set pos - TileEntity tileEntity = nmsWorld.getTileEntity(pos); - if (tileEntity != null) { - NBTTagCompound tag = (NBTTagCompound) SpongeQueue_1_12.methodFromNative.invoke(SpongeQueue_1_12.adapter, nativeTag); - tag.setInteger("x", pos.getX()); - tag.setInteger("y", pos.getY()); - tag.setInteger("z", pos.getZ()); - tileEntity.readFromNBT(tag); // ReadTagIntoTile + if (!tilesToSpawn.isEmpty()) { + synchronized (SpongeChunk_1_12.class) { + for (Map.Entry entry : tilesToSpawn.entrySet()) { + CompoundTag nativeTag = entry.getValue(); + short blockHash = entry.getKey(); + int x = (blockHash >> 12 & 0xF) + bx; + int y = (blockHash & 0xFF); + int z = (blockHash >> 8 & 0xF) + bz; + BlockPos pos = new BlockPos(x, y, z); // Set pos + TileEntity tileEntity = nmsWorld.getTileEntity(pos); + if (tileEntity != null) { + NBTTagCompound tag = (NBTTagCompound) SpongeQueue_1_12.methodFromNative.invoke(SpongeQueue_1_12.adapter, nativeTag); + tag.setInteger("x", pos.getX()); + tag.setInteger("y", pos.getY()); + tag.setInteger("z", pos.getZ()); + tileEntity.readFromNBT(tag); // ReadTagIntoTile + } + } } } } catch (Throwable e) { diff --git a/sponge111/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeChunk_1_11.java b/sponge111/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeChunk_1_11.java index c6ea5dd0..0e55861b 100644 --- a/sponge111/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeChunk_1_11.java +++ b/sponge111/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeChunk_1_11.java @@ -380,21 +380,24 @@ public class SpongeChunk_1_11 extends CharFaweChunk { } // Set tiles Map tilesToSpawn = this.getTiles(); - - for (Map.Entry entry : tilesToSpawn.entrySet()) { - CompoundTag nativeTag = entry.getValue(); - short blockHash = entry.getKey(); - int x = (blockHash >> 12 & 0xF) + bx; - int y = (blockHash & 0xFF); - int z = (blockHash >> 8 & 0xF) + bz; - BlockPos pos = new BlockPos(x, y, z); // Set pos - TileEntity tileEntity = nmsWorld.getTileEntity(pos); - if (tileEntity != null) { - NBTTagCompound tag = (NBTTagCompound) SpongeQueue_1_11.methodFromNative.invoke(SpongeQueue_1_11.adapter, nativeTag); - tag.setInteger("x", pos.getX()); - tag.setInteger("y", pos.getY()); - tag.setInteger("z", pos.getZ()); - tileEntity.readFromNBT(tag); // ReadTagIntoTile + if (!tilesToSpawn.isEmpty()) { + synchronized (SpongeChunk_1_11.class) { + for (Map.Entry entry : tilesToSpawn.entrySet()) { + CompoundTag nativeTag = entry.getValue(); + short blockHash = entry.getKey(); + int x = (blockHash >> 12 & 0xF) + bx; + int y = (blockHash & 0xFF); + int z = (blockHash >> 8 & 0xF) + bz; + BlockPos pos = new BlockPos(x, y, z); // Set pos + TileEntity tileEntity = nmsWorld.getTileEntity(pos); + if (tileEntity != null) { + NBTTagCompound tag = (NBTTagCompound) SpongeQueue_1_11.methodFromNative.invoke(SpongeQueue_1_11.adapter, nativeTag); + tag.setInteger("x", pos.getX()); + tag.setInteger("y", pos.getY()); + tag.setInteger("z", pos.getZ()); + tileEntity.readFromNBT(tag); // ReadTagIntoTile + } + } } } } catch (Throwable e) {