From 9019aab535701f41e3e7fb14816f1db98ba8cb24 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Wed, 24 Nov 2021 21:35:24 -0500 Subject: [PATCH] more i guess pepeW --- .../Do-not-allow-the-server-to-unload-chunks-at-request-.patch | 0 .../server/Make-CallbackExecutor-strict-again.patch | 0 .../server/Vanilla-command-permission-fixes.patch | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename patches/{unapplied => }/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch (100%) rename patches/{unapplied => }/server/Make-CallbackExecutor-strict-again.patch (100%) rename patches/{unapplied => }/server/Vanilla-command-permission-fixes.patch (96%) diff --git a/patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch b/patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch similarity index 100% rename from patches/unapplied/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch rename to patches/server/Do-not-allow-the-server-to-unload-chunks-at-request-.patch diff --git a/patches/unapplied/server/Make-CallbackExecutor-strict-again.patch b/patches/server/Make-CallbackExecutor-strict-again.patch similarity index 100% rename from patches/unapplied/server/Make-CallbackExecutor-strict-again.patch rename to patches/server/Make-CallbackExecutor-strict-again.patch diff --git a/patches/unapplied/server/Vanilla-command-permission-fixes.patch b/patches/server/Vanilla-command-permission-fixes.patch similarity index 96% rename from patches/unapplied/server/Vanilla-command-permission-fixes.patch rename to patches/server/Vanilla-command-permission-fixes.patch index 1ff7f61e04..e224be53da 100644 --- a/patches/unapplied/server/Vanilla-command-permission-fixes.patch +++ b/patches/server/Vanilla-command-permission-fixes.patch @@ -45,7 +45,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + } + // Paper end this.dispatcher.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> { - // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.b.getPath(commandnode1), this.b.getPath(commandnode2), collection); // CraftBukkit + // CommandDispatcher.LOGGER.warn("Ambiguity between arguments {} and {} with inputs: {}", this.dispatcher.getPath(commandnode1), this.dispatcher.getPath(commandnode2), collection); // CraftBukkit }); diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644