Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
41647af74c
We cannot put blocking network I/O onto the worldgen threads, this will crash the server if it stalls
29 Zeilen
1.5 KiB
Diff
29 Zeilen
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: virustotalop <virustotalop@gmail.com>
|
|
Date: Thu, 16 Apr 2020 20:51:32 -0700
|
|
Subject: [PATCH] Optimize brigadier child sorting performance
|
|
|
|
|
|
diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
index da6250df1c5f3385b683cffde47754bca4606f5e..a4f97c1df86c574af9b9824a38034a3d76d6e357 100644
|
|
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
@@ -26,7 +26,7 @@ import java.util.function.Predicate;
|
|
import net.minecraft.commands.CommandSourceStack;
|
|
|
|
public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
|
|
- private final Map<String, CommandNode<S>> children = new LinkedHashMap<>();
|
|
+ private Map<String, CommandNode<S>> children = com.google.common.collect.Maps.newTreeMap(); // Paper - Switch to tree map for automatic sorting
|
|
private final Map<String, LiteralCommandNode<S>> literals = new LinkedHashMap<>();
|
|
private final Map<String, ArgumentCommandNode<S, ?>> arguments = new LinkedHashMap<>();
|
|
public Predicate<S> requirement;
|
|
@@ -106,6 +106,8 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
|
|
this.arguments.put(node.getName(), (ArgumentCommandNode<S, ?>) node);
|
|
}
|
|
}
|
|
+
|
|
+ // Paper - Remove manual sorting, it is no longer needed
|
|
}
|
|
|
|
public void findAmbiguities(final AmbiguityConsumer<S> consumer) {
|