Merge https://github.com/IntellectualSites/FastAsyncWorldEdit

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/BukkitQueueHandler.java

@@ -3,8 +3,6 @@ package com.fastasyncworldedit.bukkit.adapter;
 import co.aikar.timings.Timings;
 import com.fastasyncworldedit.bukkit.listener.ChunkListener;
 import com.fastasyncworldedit.core.queue.implementation.QueueHandler;
-import com.sk89q.worldedit.internal.util.LogManagerCompat;
-import org.apache.logging.log4j.Logger;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -31,7 +29,7 @@ public class BukkitQueueHandler extends QueueHandler {
     }
 
     @Override
-    public void startSet(boolean parallel) {
+    public void startUnsafe(boolean parallel) {
         ChunkListener.physicsFreeze = true;
         if (parallel) {
             try {
@@ -51,7 +49,7 @@ public class BukkitQueueHandler extends QueueHandler {
     }
 
     @Override
-    public void endSet(boolean parallel) {
+    public void endUnsafe(boolean parallel) {
         ChunkListener.physicsFreeze = false;
         if (parallel) {
             try {

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/adapter/Regenerator.java

@@ -165,7 +165,11 @@ public abstract class Regenerator<IChunkAccess, ProtoChunk extends IChunkAccess,
                     .setNameFormat("fawe-regen-%d")
                     .build()
             );
-        } // else using sequential chunk generation, concurrent not supported
+        } else { // else using sequential chunk generation, concurrent not supported
+            executor = Executors.newSingleThreadExecutor(new ThreadFactoryBuilder()
+                    .setNameFormat("fawe-regen-%d")
+                    .build());
+        }
 
         //TODO: can we get that required radius down without affecting chunk generation (e.g. strucures, features, ...)?
         //for now it is working well and fast, if we are bored in the future we could do the research (a lot of it) to reduce the border radius
@@ -253,10 +257,13 @@ public abstract class Regenerator<IChunkAccess, ProtoChunk extends IChunkAccess,
                     e.printStackTrace();
                 }
             } else { // Concurrency.NONE or generateConcurrent == false
-                // run sequential
-                for (long xz : coords) {
-                    chunkStatus.processChunkSave(xz, worldlimits.get(radius).get(xz));
-                }
+                // run sequential but submit to different thread
+                // running regen on the main thread otherwise triggers async-only events on the main thread
+                executor.submit(() -> {
+                    for (long xz : coords) {
+                        chunkStatus.processChunkSave(xz, worldlimits.get(radius).get(xz));
+                    }
+                }).get(); // wait until finished this step
             }
         }
 

worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/listener/ChunkListener.java

@@ -371,48 +371,6 @@ public abstract class ChunkListener implements Listener {
         }
     }
 
-    /**
-     * Prevent firework from loading chunks.
-     */
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onChunkLoad(ChunkLoadEvent event) {
-        if (!Settings.settings().TICK_LIMITER.FIREWORKS_LOAD_CHUNKS) {
-            Chunk chunk = event.getChunk();
-            Entity[] entities = chunk.getEntities();
-            World world = chunk.getWorld();
-
-            Exception e = new Exception();
-            int start = 14;
-            int end = 22;
-            int depth = Math.min(end, getDepth(e));
-
-            for (int frame = start; frame < depth; frame++) {
-                StackTraceElement elem = getElement(e, frame);
-                if (elem == null) {
-                    return;
-                }
-                String className = elem.getClassName();
-                int len = className.length();
-                if (len > 15 && className.charAt(len - 15) == 'E' && className
-                        .endsWith("EntityFireworks")) {
-                    for (Entity ent : world.getEntities()) {
-                        if (ent.getType() == EntityType.FIREWORK) {
-                            Vector velocity = ent.getVelocity();
-                            double vertical = Math.abs(velocity.getY());
-                            if (Math.abs(velocity.getX()) > vertical
-                                    || Math.abs(velocity.getZ()) > vertical) {
-                                LOGGER.warn(
-                                        "[FAWE `tick-limiter`] Detected and cancelled rogue FireWork at {}",
-                                        ent.getLocation());
-                                ent.remove();
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
     @EventHandler(priority = EventPriority.LOWEST)
     public void onItemSpawn(ItemSpawnEvent event) {
         if (physicsFreeze) {

worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java

@@ -112,11 +112,15 @@ public class WorldEditPlugin extends JavaPlugin {
     private BukkitServerInterface platform;
     private BukkitConfiguration config;
     private BukkitPermissionAttachmentManager permissionAttachmentManager;
+    // Fawe start
+    private BukkitCommandSender bukkitConsoleCommandSender;
+    // Fawe end
 
     @Override
     public void onLoad() {
 
         //FAWE start
+        this.bukkitConsoleCommandSender = new BukkitCommandSender(this, Bukkit.getConsoleSender());
         // This is already covered by Spigot, however, a more pesky warning with a proper explanation over "Ambiguous plugin name..." can't hurt.
         Plugin[] plugins = Bukkit.getServer().getPluginManager().getPlugins();
         for (Plugin p : plugins) {
@@ -594,7 +598,7 @@ public class WorldEditPlugin extends JavaPlugin {
             return new BukkitBlockCommandSender(this, (BlockCommandSender) sender);
         }
 
-        return new BukkitCommandSender(this, sender);
+        return bukkitConsoleCommandSender;
     }
 
     public BukkitServerInterface getInternalPlatform() {