ObsidianMC/Obsidian
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use Brig Dispatcher when Possible

Browse source
This commit is contained in:
Owen1212055 2024-05-11 17:41:38 -04:00
parent b6b493f96c
commit 97eac0527f
No known key found for this signature in database
GPG key ID: 2133292072886A30
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/server/1051-Use-Brig-Dispatcher-when-Possible.patch
View file

@ -40,7 +40,7 @@ index 2eb9c584cc77237f1c82d880a51a3f8b51008d73..4f148e303ae06648d93e3f9a934ef592
}); });
// Paper start // Paper start
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java 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 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/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 { @@ -965,9 +965,7 @@ public final class CraftServer implements Server {
@ -54,15 +54,21 @@ index 7c165ed8b1fd8072bbfbed7b4f865b72f677a2a3..ad56388d05065efdb23fe5b44f7c7ace
return this.dispatchCommand(VanillaCommandWrapper.getListener(sender), commandLine); 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 { try {
+ if (results.getContext().getNodes().isEmpty()) {
+ return false;
+ }
+ Commands.validateParseResults(results);
+
commands.performCommand(results, commandLine, commandLine, true); commands.performCommand(results, commandLine, commandLine, true);
+ return true; + return true;
} catch (CommandException ex) { } catch (CommandException ex) {
this.pluginManager.callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerCommandException(ex, target, sender, args))); // Paper 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 //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); throw new CommandException(msg, ex);
} }
// Paper end // Paper end