rebase on latest paper

gradle.properties

@@ -4,7 +4,7 @@ version = 1.18-pre8-R0.1-SNAPSHOT
 mcVersion = 1.18-pre8
 packageVersion = 1_18_R1
 
-paperCommit = af8691c73b2c150cb4e10dab64908d7c4ca8e553
+paperCommit = cadb66410d4ccd069f380ac68d5897bce4b09c9a
 
 org.gradle.caching = true
 org.gradle.parallel = true

patches/server/0024-Fix-vanilla-command-permission-handler.patch

@@ -17,7 +17,7 @@ index f64aa22ed6fcb4af67317b99f459ee5296392548..36c91793e0aa4895193623cf8cba7820
      public void removeCommand(String name) {
          this.children.remove(name);
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
-index 0377c706c9aec6f367e83f859f9a3432ad5bba4a..96691990aa3ede953e41df6e3b36bb1eb1e3fd13 100644
+index e9d1fb479855194da5a05e86861848158736cbb4..b06f070a8030e5a6d965a2705749874895db58b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/VanillaCommandWrapper.java
 @@ -87,6 +87,7 @@ public final class VanillaCommandWrapper extends BukkitCommand {
@@ -25,6 +25,6 @@ index 0377c706c9aec6f367e83f859f9a3432ad5bba4a..96691990aa3ede953e41df6e3b36bb1e
  
      public static String getPermission(CommandNode<CommandSourceStack> vanillaCommand) {
 +        if (vanillaCommand.getPermission() != null) return vanillaCommand.getPermission(); // Purpur
-         return "minecraft.command." + ((vanillaCommand.getRedirect() == null) ? vanillaCommand.getName() : vanillaCommand.getRedirect().getName());
-     }
- 
+         // Paper start
+         final String commandName;
+         if (vanillaCommand.getRedirect() == null) {