Slight change to wna caching

- We don't want to flush if we're setting from the main thread, as that's going to be another plugin doing it
 - It's better to have a concurrent error thrown than use a concurrent set, so concurrency issues can actually be fixed rather than handled unsafely
 - Only send chunk packets up to once a tick (it really doesn't use any memory to cache IntPairs).

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_15_2/FAWEWorldNativeAccess_1_15_2.java

@@ -11,7 +11,6 @@ import com.sk89q.worldedit.internal.block.BlockStateIdAccess;
 import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
 import com.sk89q.worldedit.util.SideEffect;
 import com.sk89q.worldedit.util.SideEffectSet;
-import io.netty.util.internal.ConcurrentSet;
 import net.minecraft.server.v1_15_R1.Block;
 import net.minecraft.server.v1_15_R1.BlockPosition;
 import net.minecraft.server.v1_15_R1.Chunk;
@@ -29,7 +28,8 @@ import org.bukkit.craftbukkit.v1_15_R1.block.data.CraftBlockData;
 import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.lang.ref.WeakReference;
-import java.util.LinkedHashSet;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -43,7 +43,8 @@ public class FAWEWorldNativeAccess_1_15_2 implements WorldNativeAccess<Chunk, IB
     private final WeakReference<World> world;
     private SideEffectSet sideEffectSet;
     private final AtomicInteger lastTick;
-    private final Set<CachedChange> cachedChanges = new ConcurrentSet<>();
+    private final Set<CachedChange> cachedChanges = new HashSet<>();
+    private final Set<IntPair> cachedChunksToSend = new HashSet<>();
 
     public FAWEWorldNativeAccess_1_15_2(FAWE_Spigot_v1_15_R2 adapter, WeakReference<World> world) {
         this.adapter = adapter;
@@ -82,25 +83,26 @@ public class FAWEWorldNativeAccess_1_15_2 implements WorldNativeAccess<Chunk, IB
 
     @Nullable
     @Override
-    public IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
+    public synchronized IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
         int currentTick = MinecraftServer.currentTick;
         if (Fawe.isMainThread()) {
-            if (lastTick.get() > currentTick) {
-                lastTick.set(currentTick);
-                flush();
-            }
             return chunk.setType(position, state,
                 this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE));
         }
         // Since FAWE is.. Async we need to do it on the main thread (wooooo.. :( )
         cachedChanges.add(new CachedChange(chunk, position, state));
-        if (lastTick.get() > currentTick || cachedChanges.size() > 1024) {
+        cachedChunksToSend.add(new IntPair(chunk.bukkitChunk.getX(), chunk.bukkitChunk.getZ()));
-            lastTick.set(currentTick);
+        boolean nextTick = lastTick.get() > currentTick;
-            flush();
+        if (nextTick || cachedChanges.size() >= 1024) {
+            if (nextTick) {
+                lastTick.set(currentTick);
+            }
+            flushAsync(nextTick);
         }
         return state;
     }
 
+
     @Override
     public IBlockData getValidBlockForPosition(IBlockData block, BlockPosition position) {
         return Block.b(block, getWorld(), position);
@@ -193,28 +195,51 @@ public class FAWEWorldNativeAccess_1_15_2 implements WorldNativeAccess<Chunk, IB
         getWorld().a(pos, oldState, newState);
     }
 
-    @Override
+    private synchronized void flushAsync(final boolean sendChunks) {
-    public synchronized void flush() {
+        final Set<CachedChange> changes = Collections.unmodifiableSet(cachedChanges);
-        Set<IntPair> toSend = new LinkedHashSet<>();
+        cachedChanges.clear();
+        final Set<IntPair> toSend;
+        if (sendChunks) {
+            toSend = Collections.unmodifiableSet(cachedChunksToSend);
+            cachedChunksToSend.clear();
+        } else {
+            toSend = Collections.emptySet();
+        }
         RunnableVal<Object> r = new RunnableVal<Object>() {
             @Override
             public void run(Object value) {
-                cachedChanges.forEach(cc -> {
+                changes.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
-                    cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
-                        sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE));
+                if (!sendChunks) {
-                    toSend.add(new IntPair(cc.chunk.getBukkitChunk().getX(), cc.chunk.bukkitChunk.getZ()));
+                    return;
-                });
+                }
                 for (IntPair chunk : toSend) {
                     BukkitAdapter_1_15_2.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
                 }
             }
         };
+        TaskManager.IMP.async(() -> TaskManager.IMP.sync(r));
+    }
+
+    @Override
+    public synchronized void flush() {
+        RunnableVal<Object> r = new RunnableVal<Object>() {
+            @Override
+            public void run(Object value) {
+                cachedChanges.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
+                for (IntPair chunk : cachedChunksToSend) {
+                    BukkitAdapter_1_15_2.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
+                }
+            }
+        };
         if (Fawe.isMainThread()) {
             r.run();
         } else {
             TaskManager.IMP.sync(r);
         }
         cachedChanges.clear();
+        cachedChunksToSend.clear();
     }
 
     private static final class CachedChange {

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/FAWEWorldNativeAccess_1_16_R1.java

@@ -12,7 +12,6 @@ import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
 import com.sk89q.worldedit.util.SideEffect;
 import com.sk89q.worldedit.util.SideEffectSet;
 import com.sk89q.worldedit.world.block.BlockState;
-import io.netty.util.internal.ConcurrentSet;
 import net.minecraft.server.v1_16_R1.Block;
 import net.minecraft.server.v1_16_R1.BlockPosition;
 import net.minecraft.server.v1_16_R1.Chunk;
@@ -30,7 +29,8 @@ import org.bukkit.craftbukkit.v1_16_R1.block.data.CraftBlockData;
 import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.lang.ref.WeakReference;
-import java.util.LinkedHashSet;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -44,7 +44,8 @@ public class FAWEWorldNativeAccess_1_16_R1 implements WorldNativeAccess<Chunk, I
     private final WeakReference<World> world;
     private SideEffectSet sideEffectSet;
     private final AtomicInteger lastTick;
-    private final Set<CachedChange> cachedChanges = new ConcurrentSet<>();
+    private final Set<CachedChange> cachedChanges = new HashSet<>();
+    private final Set<IntPair> cachedChunksToSend = new HashSet<>();
 
     public FAWEWorldNativeAccess_1_16_R1(FAWE_Spigot_v1_16_R1 adapter, WeakReference<World> world) {
         this.adapter = adapter;
@@ -83,25 +84,26 @@ public class FAWEWorldNativeAccess_1_16_R1 implements WorldNativeAccess<Chunk, I
 
     @Nullable
     @Override
-    public IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
+    public synchronized IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
         int currentTick = MinecraftServer.currentTick;
         if (Fawe.isMainThread()) {
-            if (lastTick.get() > currentTick) {
-                lastTick.set(currentTick);
-                flush();
-            }
             return chunk.setType(position, state,
                 this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE));
         }
         // Since FAWE is.. Async we need to do it on the main thread (wooooo.. :( )
         cachedChanges.add(new CachedChange(chunk, position, state));
-        if (lastTick.get() > currentTick || cachedChanges.size() > 1024) {
+        cachedChunksToSend.add(new IntPair(chunk.bukkitChunk.getX(), chunk.bukkitChunk.getZ()));
-            lastTick.set(currentTick);
+        boolean nextTick = lastTick.get() > currentTick;
-            flush();
+        if (nextTick || cachedChanges.size() >= 1024) {
+            if (nextTick) {
+                lastTick.set(currentTick);
+            }
+            flushAsync(nextTick);
         }
         return state;
     }
 
+
     @Override
     public IBlockData getValidBlockForPosition(IBlockData block, BlockPosition position) {
         return Block.b(block, getWorld(), position);
@@ -194,28 +196,51 @@ public class FAWEWorldNativeAccess_1_16_R1 implements WorldNativeAccess<Chunk, I
         getWorld().a(pos, oldState, newState);
     }
 
-    @Override
+    private synchronized void flushAsync(final boolean sendChunks) {
-    public synchronized void flush() {
+        final Set<CachedChange> changes = Collections.unmodifiableSet(cachedChanges);
-        Set<IntPair> toSend = new LinkedHashSet<>();
+        cachedChanges.clear();
+        final Set<IntPair> toSend;
+        if (sendChunks) {
+            toSend = Collections.unmodifiableSet(cachedChunksToSend);
+            cachedChunksToSend.clear();
+        } else {
+            toSend = Collections.emptySet();
+        }
         RunnableVal<Object> r = new RunnableVal<Object>() {
             @Override
             public void run(Object value) {
-                cachedChanges.forEach(cc -> {
+                changes.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
-                    cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
-                        sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE));
+                if (!sendChunks) {
-                    toSend.add(new IntPair(cc.chunk.getBukkitChunk().getX(), cc.chunk.bukkitChunk.getZ()));
+                    return;
-                });
+                }
                 for (IntPair chunk : toSend) {
                     BukkitAdapter_1_16_1.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
                 }
             }
         };
+        TaskManager.IMP.async(() -> TaskManager.IMP.sync(r));
+    }
+
+    @Override
+    public synchronized void flush() {
+        RunnableVal<Object> r = new RunnableVal<Object>() {
+            @Override
+            public void run(Object value) {
+                cachedChanges.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
+                for (IntPair chunk : cachedChunksToSend) {
+                    BukkitAdapter_1_16_1.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
+                }
+            }
+        };
         if (Fawe.isMainThread()) {
             r.run();
         } else {
             TaskManager.IMP.sync(r);
         }
         cachedChanges.clear();
+        cachedChunksToSend.clear();
     }
 
     private static final class CachedChange {

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_2/FAWEWorldNativeAccess_1_16_R2.java

@@ -12,7 +12,6 @@ import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
 import com.sk89q.worldedit.util.SideEffect;
 import com.sk89q.worldedit.util.SideEffectSet;
 import com.sk89q.worldedit.world.block.BlockState;
-import io.netty.util.internal.ConcurrentSet;
 import net.minecraft.server.v1_16_R2.Block;
 import net.minecraft.server.v1_16_R2.BlockPosition;
 import net.minecraft.server.v1_16_R2.Chunk;
@@ -30,7 +29,8 @@ import org.bukkit.craftbukkit.v1_16_R2.block.data.CraftBlockData;
 import org.bukkit.event.block.BlockPhysicsEvent;
 
 import java.lang.ref.WeakReference;
-import java.util.LinkedHashSet;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -44,7 +44,8 @@ public class FAWEWorldNativeAccess_1_16_R2 implements WorldNativeAccess<Chunk, I
     private final WeakReference<World> world;
     private SideEffectSet sideEffectSet;
     private final AtomicInteger lastTick;
-    private final Set<CachedChange> cachedChanges = new ConcurrentSet<>();
+    private final Set<CachedChange> cachedChanges = new HashSet<>();
+    private final Set<IntPair> cachedChunksToSend = new HashSet<>();
 
     public FAWEWorldNativeAccess_1_16_R2(FAWE_Spigot_v1_16_R2 adapter, WeakReference<World> world) {
         this.adapter = adapter;
@@ -83,25 +84,26 @@ public class FAWEWorldNativeAccess_1_16_R2 implements WorldNativeAccess<Chunk, I
 
     @Nullable
     @Override
-    public IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
+    public synchronized IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
         int currentTick = MinecraftServer.currentTick;
         if (Fawe.isMainThread()) {
-            if (lastTick.get() > currentTick) {
-                lastTick.set(currentTick);
-                flush();
-            }
             return chunk.setType(position, state,
                 this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE));
         }
         // Since FAWE is.. Async we need to do it on the main thread (wooooo.. :( )
         cachedChanges.add(new CachedChange(chunk, position, state));
-        if (lastTick.get() > currentTick || cachedChanges.size() > 1024) {
+        cachedChunksToSend.add(new IntPair(chunk.bukkitChunk.getX(), chunk.bukkitChunk.getZ()));
-            lastTick.set(currentTick);
+        boolean nextTick = lastTick.get() > currentTick;
-            flush();
+        if (nextTick || cachedChanges.size() >= 1024) {
+            if (nextTick) {
+                lastTick.set(currentTick);
+            }
+            flushAsync(nextTick);
         }
         return state;
     }
 
+
     @Override
     public IBlockData getValidBlockForPosition(IBlockData block, BlockPosition position) {
         return Block.b(block, getWorld(), position);
@@ -194,28 +196,51 @@ public class FAWEWorldNativeAccess_1_16_R2 implements WorldNativeAccess<Chunk, I
         getWorld().a(pos, oldState, newState);
     }
 
-    @Override
+    private synchronized void flushAsync(final boolean sendChunks) {
-    public synchronized void flush() {
+        final Set<CachedChange> changes = Collections.unmodifiableSet(cachedChanges);
-        Set<IntPair> toSend = new LinkedHashSet<>();
+        cachedChanges.clear();
+        final Set<IntPair> toSend;
+        if (sendChunks) {
+            toSend = Collections.unmodifiableSet(cachedChunksToSend);
+            cachedChunksToSend.clear();
+        } else {
+            toSend = Collections.emptySet();
+        }
         RunnableVal<Object> r = new RunnableVal<Object>() {
             @Override
             public void run(Object value) {
-                cachedChanges.forEach(cc -> {
+                changes.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
-                    cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
-                        sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE));
+                if (!sendChunks) {
-                    toSend.add(new IntPair(cc.chunk.getBukkitChunk().getX(), cc.chunk.bukkitChunk.getZ()));
+                    return;
-                });
+                }
                 for (IntPair chunk : toSend) {
                     BukkitAdapter_1_16_2.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
                 }
             }
         };
+        TaskManager.IMP.async(() -> TaskManager.IMP.sync(r));
+    }
+
+    @Override
+    public synchronized void flush() {
+        RunnableVal<Object> r = new RunnableVal<Object>() {
+            @Override
+            public void run(Object value) {
+                cachedChanges.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
+                for (IntPair chunk : cachedChunksToSend) {
+                    BukkitAdapter_1_16_2.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
+                }
+            }
+        };
         if (Fawe.isMainThread()) {
             r.run();
         } else {
             TaskManager.IMP.sync(r);
         }
         cachedChanges.clear();
+        cachedChunksToSend.clear();
     }
 
     private static final class CachedChange {

worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_4/FAWEWorldNativeAccess_1_16_R3.java

@@ -12,7 +12,6 @@ import com.sk89q.worldedit.internal.wna.WorldNativeAccess;
 import com.sk89q.worldedit.util.SideEffect;
 import com.sk89q.worldedit.util.SideEffectSet;
 import com.sk89q.worldedit.world.block.BlockState;
-import io.netty.util.internal.ConcurrentSet;
 import net.minecraft.server.v1_16_R3.Block;
 import net.minecraft.server.v1_16_R3.BlockPosition;
 import net.minecraft.server.v1_16_R3.Chunk;
@@ -31,7 +30,8 @@ import org.bukkit.event.block.BlockPhysicsEvent;
 
 import javax.annotation.Nullable;
 import java.lang.ref.WeakReference;
-import java.util.LinkedHashSet;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -44,7 +44,8 @@ public class FAWEWorldNativeAccess_1_16_R3 implements WorldNativeAccess<Chunk, I
     private final WeakReference<World> world;
     private SideEffectSet sideEffectSet;
     private final AtomicInteger lastTick;
-    private final Set<CachedChange> cachedChanges = new ConcurrentSet<>();
+    private final Set<CachedChange> cachedChanges = new HashSet<>();
+    private final Set<IntPair> cachedChunksToSend = new HashSet<>();
 
     public FAWEWorldNativeAccess_1_16_R3(FAWE_Spigot_v1_16_R3 adapter, WeakReference<World> world) {
         this.adapter = adapter;
@@ -86,18 +87,18 @@ public class FAWEWorldNativeAccess_1_16_R3 implements WorldNativeAccess<Chunk, I
     public synchronized IBlockData setBlockState(Chunk chunk, BlockPosition position, IBlockData state) {
         int currentTick = MinecraftServer.currentTick;
         if (Fawe.isMainThread()) {
-            if (lastTick.get() > currentTick) {
-                lastTick.set(currentTick);
-                flush();
-            }
             return chunk.setType(position, state,
                 this.sideEffectSet != null && this.sideEffectSet.shouldApply(SideEffect.UPDATE));
         }
         // Since FAWE is.. Async we need to do it on the main thread (wooooo.. :( )
         cachedChanges.add(new CachedChange(chunk, position, state));
-        if (lastTick.get() > currentTick || cachedChanges.size() > 1024) {
+        cachedChunksToSend.add(new IntPair(chunk.bukkitChunk.getX(), chunk.bukkitChunk.getZ()));
-            lastTick.set(currentTick);
+        boolean nextTick = lastTick.get() > currentTick;
-            flush();
+        if (nextTick || cachedChanges.size() >= 1024) {
+            if (nextTick) {
+                lastTick.set(currentTick);
+            }
+            flushAsync(nextTick);
         }
         return state;
     }
@@ -194,28 +195,51 @@ public class FAWEWorldNativeAccess_1_16_R3 implements WorldNativeAccess<Chunk, I
         getWorld().a(pos, oldState, newState);
     }
 
-    @Override
+    private synchronized void flushAsync(final boolean sendChunks) {
-    public synchronized void flush() {
+        final Set<CachedChange> changes = Collections.unmodifiableSet(cachedChanges);
-        Set<IntPair> toSend = new LinkedHashSet<>();
+        cachedChanges.clear();
+        final Set<IntPair> toSend;
+        if (sendChunks) {
+            toSend = Collections.unmodifiableSet(cachedChunksToSend);
+            cachedChunksToSend.clear();
+        } else {
+            toSend = Collections.emptySet();
+        }
         RunnableVal<Object> r = new RunnableVal<Object>() {
             @Override
             public void run(Object value) {
-                cachedChanges.forEach(cc -> {
+                changes.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
-                    cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
-                        sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE));
+                if (!sendChunks) {
-                    toSend.add(new IntPair(cc.chunk.getBukkitChunk().getX(), cc.chunk.bukkitChunk.getZ()));
+                    return;
-                });
+                }
                 for (IntPair chunk : toSend) {
                     BukkitAdapter_1_16_4.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
                 }
             }
         };
+        TaskManager.IMP.async(() -> TaskManager.IMP.sync(r));
+    }
+
+    @Override
+    public synchronized void flush() {
+        RunnableVal<Object> r = new RunnableVal<Object>() {
+            @Override
+            public void run(Object value) {
+                cachedChanges.forEach(cc -> cc.chunk.setType(cc.position, cc.blockData,
+                    sideEffectSet != null && sideEffectSet.shouldApply(SideEffect.UPDATE)));
+                for (IntPair chunk : cachedChunksToSend) {
+                    BukkitAdapter_1_16_4.sendChunk(getWorld().getWorld().getHandle(), chunk.x, chunk.z, 0, false);
+                }
+            }
+        };
         if (Fawe.isMainThread()) {
             r.run();
         } else {
             TaskManager.IMP.sync(r);
         }
         cachedChanges.clear();
+        cachedChunksToSend.clear();
     }
 
     private static final class CachedChange {