Simplify command dispatch to ensure command order (#2131)

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformCommandManager.java

@@ -678,20 +678,16 @@ public final class PlatformCommandManager {
 
         Actor actor = event.getActor();
         String args = event.getArguments();
-        TaskManager.taskManager().taskNow(() -> {
-            if (!Fawe.isMainThread()) {
-                Thread.currentThread().setName("FAWE Thread for player: " + actor.getName());
-            }
         int space0 = args.indexOf(' ');
         String arg0 = space0 == -1 ? args : args.substring(0, space0);
         Optional<Command> optional = commandManager.getCommand(arg0);
-            if (!optional.isPresent()) {
+        if (optional.isEmpty()) {
             return;
         }
         Command cmd = optional.get();
         PermissionCondition queued = cmd.getCondition().as(PermissionCondition.class).orElse(null);
         if (queued != null && !queued.isQueued()) {
-                handleCommandOnCurrentThread(event);
+            TaskManager.taskManager().taskNow(() -> handleCommandOnCurrentThread(event), Fawe.isMainThread());
             return;
         } else {
             actor.decline();
@@ -702,7 +698,6 @@ public final class PlatformCommandManager {
                 PlatformCommandManager.this.handleCommandOnCurrentThread(event);
             }
         }, false, true);
-        }, Fawe.isMainThread());
     }
 
     public void handleCommandOnCurrentThread(CommandEvent event) {