twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-06 23:22:10 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix unstable Suggestion comparison by sorting int suggestions before text ones (#11941)

Browse Source
This commit is contained in:
Emily
2025-01-12 19:49:29 -03:00
committed by GitHub
parent ad74b673fa
commit 50c2c59c4e
2 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
paper-server/patches/sources/com/mojang/brigadier/suggestion/Suggestion.java.patch Normal file
View File

@@ -0,0 +1,32 @@
--- a/com/mojang/brigadier/suggestion/Suggestion.java
+++ b/com/mojang/brigadier/suggestion/Suggestion.java
@@ -76,13 +_,27 @@
'}';
}
+ // Paper start - fix unstable Suggestion comparison
+ private static int compare0(final Suggestion lhs, final Suggestion rhs, final java.util.Comparator<String> textComparator) {
+ if (lhs instanceof final IntegerSuggestion lis && rhs instanceof final IntegerSuggestion ris) {
+ return Integer.compare(lis.getValue(), ris.getValue());
+ } else if (lhs instanceof IntegerSuggestion) {
+ return -1;
+ } else if (rhs instanceof IntegerSuggestion) {
+ return 1;
+ } else {
+ return textComparator.compare(lhs.text, rhs.text);
+ }
+ }
+ // Paper end - fix unstable Suggestion comparison
+
@Override
public int compareTo(final Suggestion o) {
- return text.compareTo(o.text);
+ return compare0(this, o, java.util.Comparator.naturalOrder()); // Paper - fix unstable Suggestion comparison
}
public int compareToIgnoreCase(final Suggestion b) {
- return text.compareToIgnoreCase(b.text);
+ return compare0(this, b, String.CASE_INSENSITIVE_ORDER); // Paper - fix unstable Suggestion comparison
}
public Suggestion expand(final String command, final StringRange range) {