From 97eac0527f2a78a23c55b608e307a1d5f90999f6 Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Sat, 11 May 2024 17:41:38 -0400
Subject: [PATCH] Use Brig Dispatcher when Possible

---
 .../1051-Use-Brig-Dispatcher-when-Possible.patch     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/patches/server/1051-Use-Brig-Dispatcher-when-Possible.patch b/patches/server/1051-Use-Brig-Dispatcher-when-Possible.patch
index 910eb293d6..c432d9fcf1 100644
--- a/patches/server/1051-Use-Brig-Dispatcher-when-Possible.patch
+++ b/patches/server/1051-Use-Brig-Dispatcher-when-Possible.patch
@@ -40,7 +40,7 @@ index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..4f148e303ae06648d93e3f9a934ef592
          });
          // Paper start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7c165ed8b1fd8072bbfbed7b4f865b72f677a2a3..ad56388d05065efdb23fe5b44f7c7ace793446e2 100644
+index 7c165ed8b1fd8072bbfbed7b4f865b72f677a2a3..6ed729a6f3d92e3fa0c61b74f96ccc62914b7a9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -965,9 +965,7 @@ public final class CraftServer implements Server {
@@ -54,15 +54,21 @@ index 7c165ed8b1fd8072bbfbed7b4f865b72f677a2a3..ad56388d05065efdb23fe5b44f7c7ace
  
          return this.dispatchCommand(VanillaCommandWrapper.getListener(sender), commandLine);
      }
-@@ -983,6 +981,7 @@ public final class CraftServer implements Server {
+@@ -982,7 +980,13 @@ public final class CraftServer implements Server {
+         Command target = this.commandMap.getCommand(args[0].toLowerCase(java.util.Locale.ENGLISH));
  
          try {
++            if (results.getContext().getNodes().isEmpty()) {
++                return false;
++            }
++            Commands.validateParseResults(results);
++
              commands.performCommand(results, commandLine, commandLine, true);
 +            return true;
          } catch (CommandException ex) {
              this.pluginManager.callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper
              //target.timings.stopTiming(); // Spigot // Paper
-@@ -994,8 +993,6 @@ public final class CraftServer implements Server {
+@@ -994,8 +998,6 @@ public final class CraftServer implements Server {
              throw new CommandException(msg, ex);
          }
          // Paper end