Fix some merge issues

2025-07-12 08:08:34 +00:00 · 2019-11-20 00:11:54 +00:00
parent 0e22d4718a
commit 60759934a3
54 changed files with 1403 additions and 1180 deletions
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/ScriptingCommands.java
@ -58,15 +58,6 @@ public class ScriptingCommands {
        this.worldEdit = worldEdit;
    }

-    @Command(
-        name = "setupdispatcher",
-        desc = ""
-    )
-    @CommandPermissions("fawe.setupdispatcher")
-    public void setupdispatcher(Player player, LocalSession session, InjectedValueAccess args) throws WorldEditException {
-        PlatformCommandManager.getInstance().registerAllCommands();
-    }
-
    @Command(
        name = "cs",
        desc = "Execute a CraftScript"