Skip to content

Commit 8c74686

Browse files
committedFeb 26, 2025
Improve command error responses
1 parent a5e160b commit 8c74686

File tree

3 files changed

+20
-11
lines changed

3 files changed

+20
-11
lines changed
 

‎gradle/libs.versions.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
adventure = "4.17.0"
3-
bluecommands = "1.3.3"
3+
bluecommands = "1.3.4"
44
bstats = "2.2.1"
55
configurate = "4.1.2"
66
junit = "5.8.2"

‎implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommands.java

+10-7
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,7 @@
3636
import org.bukkit.event.server.TabCompleteEvent;
3737
import org.jetbrains.annotations.NotNull;
3838

39-
import java.util.ArrayList;
40-
import java.util.Collection;
41-
import java.util.Comparator;
42-
import java.util.List;
39+
import java.util.*;
4340

4441
import static de.bluecolored.bluemap.common.commands.TextFormat.NEGATIVE_COLOR;
4542
import static net.kyori.adventure.text.Component.text;
@@ -114,9 +111,15 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab
114111
CommandExecutor.ExecutionResult executionResult = commandExecutor.execute(result);
115112

116113
if (executionResult.parseFailure()) {
117-
result.getFailures().stream()
118-
.max(Comparator.comparing(ParseFailure::getPosition))
119-
.ifPresent(failure -> context.sendMessage(text(failure.getReason()).color(NEGATIVE_COLOR)));
114+
Optional<ParseFailure<CommandSource, Object>> failure = result.getFailures().stream()
115+
.max(Comparator.comparing(ParseFailure::getPosition));
116+
117+
if (failure.isPresent()) {
118+
context.sendMessage(text(failure.get().getReason()).color(NEGATIVE_COLOR));
119+
} else {
120+
context.sendMessage(text("Unknown command!").color(NEGATIVE_COLOR));
121+
}
122+
120123
return false;
121124
}
122125

‎implementations/sponge/src/main/java/de/bluecolored/bluemap/sponge/SpongeCommands.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,15 @@ public CommandResult process(CommandCause cause, ArgumentReader.Mutable argument
7878
CommandExecutor.ExecutionResult executionResult = commandExecutor.execute(result);
7979

8080
if (executionResult.parseFailure()) {
81-
result.getFailures().stream()
82-
.max(Comparator.comparing(ParseFailure::getPosition))
83-
.ifPresent(failure -> context.sendMessage(text(failure.getReason()).color(NEGATIVE_COLOR)));
81+
Optional<ParseFailure<CommandSource, Object>> failure = result.getFailures().stream()
82+
.max(Comparator.comparing(ParseFailure::getPosition));
83+
84+
if (failure.isPresent()) {
85+
context.sendMessage(text(failure.get().getReason()).color(NEGATIVE_COLOR));
86+
} else {
87+
context.sendMessage(text("Unknown command!").color(NEGATIVE_COLOR));
88+
}
89+
8490
return CommandResult.builder()
8591
.result(0)
8692
.build();

0 commit comments

Comments
 (0)
Failed to load comments.