Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-14 20:10:05 +01:00
52a05907c7
Upstream has released updates that appear 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: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
47 Zeilen
2.4 KiB
Diff
47 Zeilen
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tamion <70228790+notTamion@users.noreply.github.com>
|
|
Date: Sat, 13 Jul 2024 18:00:37 +0200
|
|
Subject: [PATCH] Fix HelpCommand searching
|
|
|
|
Prevent index out of bounds exception when finding possible matches in
|
|
the help topics.
|
|
A general empty string is caught and directed to the defaultTopic by
|
|
getHelpTopic(). #findPossibleMatches hence should not concern itself
|
|
with possible empty strings anymore.
|
|
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/HelpCommand.java b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
|
|
index a1699aa93c62f70238822c446326ed46ea71db14..9c63d9dedb08f88eb14cff26ee44d6d101935177 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/HelpCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/HelpCommand.java
|
|
@@ -143,6 +143,7 @@ public class HelpCommand extends BukkitCommand {
|
|
searchString = searchString.substring(1);
|
|
}
|
|
|
|
+ if (searchString.isEmpty()) return null; // Paper - prevent index out of bounds - nothing matches an empty search string, should have been special cased to defaultTopic earlier, just return null.
|
|
for (HelpTopic topic : Bukkit.getServer().getHelpMap().getHelpTopics()) {
|
|
String trimmedTopic = topic.getName().startsWith("/") ? topic.getName().substring(1) : topic.getName();
|
|
|
|
diff --git a/src/main/java/org/bukkit/help/IndexHelpTopic.java b/src/main/java/org/bukkit/help/IndexHelpTopic.java
|
|
index 88a812d66b7eea7389103b9c2776a8adcfc141c7..74795eb1a5dacaca61ed1c918074e79f2b3d9040 100644
|
|
--- a/src/main/java/org/bukkit/help/IndexHelpTopic.java
|
|
+++ b/src/main/java/org/bukkit/help/IndexHelpTopic.java
|
|
@@ -49,10 +49,15 @@ public class IndexHelpTopic extends HelpTopic {
|
|
if (sender instanceof ConsoleCommandSender) {
|
|
return true;
|
|
}
|
|
- if (permission == null) {
|
|
- return true;
|
|
+ // Paper start - Fix HelpCommand searching - do not show index if no topic is visible to the sender
|
|
+ if (permission != null && !sender.hasPermission(permission)) return false; // old spigot permission check
|
|
+
|
|
+ for (HelpTopic topic : allTopics) {
|
|
+ if (topic.canSee(sender)) return true;
|
|
}
|
|
- return sender.hasPermission(permission);
|
|
+
|
|
+ return false;
|
|
+ // Paper end - Fix HelpCommand searching - do not show index if no topic is visible to the sender
|
|
}
|
|
|
|
@Override
|