Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 03:20:07 +01:00
1ab021ddca
Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
565a5727 #533: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
CraftBukkit Changes:
927200a9 #718: Add consumed item, hand and consumeItem boolean to EntityShootBowEvent
30 Zeilen
1.7 KiB
Diff
30 Zeilen
1.7 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 1685522b494894169b4184b0b94199aedb75b5df..6976da79b20280fcd72dcfb8b48e2eb73257faf2 100644
|
|
--- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
+++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java
|
|
@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
|
|
import net.minecraft.server.CommandListenerWrapper; // CraftBukkit
|
|
|
|
public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
|
|
- private Map<String, CommandNode<S>> children = Maps.newLinkedHashMap();
|
|
+ private Map<String, CommandNode<S>> children = Maps.newTreeMap(); //Paper - Switch to tree map for automatic sorting
|
|
private Map<String, LiteralCommandNode<S>> literals = Maps.newLinkedHashMap();
|
|
private Map<String, ArgumentCommandNode<S, ?>> arguments = Maps.newLinkedHashMap();
|
|
private final Predicate<S> requirement;
|
|
@@ -107,8 +107,7 @@ public abstract class CommandNode<S> implements Comparable<CommandNode<S>> {
|
|
arguments.put(node.getName(), (ArgumentCommandNode<S, ?>) node);
|
|
}
|
|
}
|
|
-
|
|
- children = children.entrySet().stream().sorted(Map.Entry.comparingByValue()).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue, (e1, e2) -> e1, LinkedHashMap::new));
|
|
+ //Paper - Remove manual sorting, it is no longer needed
|
|
}
|
|
|
|
public void findAmbiguities(final AmbiguityConsumer<S> consumer) {
|