GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

don't let (unexpected) exceptions thrown while handling command exceptions be swallowed

This commit is contained in:
Konicai 2023-10-01 23:21:47 -04:00
parent f5b245718e
commit 0cfee52e48
No known key found for this signature in database
GPG Key ID: 710D09287708C823
2 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/src/main/java/org/geysermc/geyser/command/CommandRegistry.java
View File

@ -69,7 +69,6 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletionException;
import java.util.function.BiConsumer;
@ -258,7 +257,13 @@ public class CommandRegistry {
throwable = throwable.getCause();
}
handleThrowable(source, throwable);
try {
handleThrowable(source, throwable);
} catch (Throwable secondary) {
// otherwise it gets swallowed by whenComplete.
// we assume this won't throw.
handleUnexpectedThrowable(source, secondary);
}
});
}
@ -279,18 +284,24 @@ public class CommandRegistry {
// find the Command and its Meta that the source tried executing
List<CommandArgument<?, ?>> argumentChain = exception.getCurrentChain();
CommandArgument<?, ?> argument = argumentChain.get(argumentChain.size() - 1);
CommandMeta meta = Objects.requireNonNull(argument.getOwningCommand()).getCommandMeta();
cloud.commandframework.Command<?> owner = argument.getOwningCommand();
// See GeyserCommand#baseBuilder()
if (meta.getOrDefault(GeyserCommand.BEDROCK_ONLY, false)) {
if (source.connection().isEmpty()) {
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.command.bedrock_only", source.locale()));
return;
}
} else if (meta.getOrDefault(GeyserCommand.PLAYER_ONLY, false)) {
if (source.isConsole()) {
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.command.player_only", source.locale()));
return;
if (owner == null) {
GeyserImpl.getInstance().getLogger().debug("Unable to check for command meta because " + argument + " does not have an owning command");
} else {
CommandMeta meta = owner.getCommandMeta();
// See GeyserCommand#baseBuilder()
if (meta.getOrDefault(GeyserCommand.BEDROCK_ONLY, false)) {
if (source.connection().isEmpty()) {
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.command.bedrock_only", source.locale()));
return;
}
} else if (meta.getOrDefault(GeyserCommand.PLAYER_ONLY, false)) {
if (source.isConsole()) {
source.sendMessage(ChatColor.RED + GeyserLocale.getPlayerLocaleString("geyser.command.player_only", source.locale()));
return;
}
}
}

2
core/src/main/java/org/geysermc/geyser/command/GeyserCommand.java
View File

@ -192,7 +192,7 @@ public abstract class GeyserCommand implements org.geysermc.geyser.api.command.C
* @return an Applicable that applies {@link #BEDROCK_ONLY} and {@link #PLAYER_ONLY} as meta,
* according to {@link #isBedrockOnly()} and {@link #isExecutableOnConsole()} (respectively).
*/
public Command.Builder.Applicable<GeyserCommandSource> meta() {
protected Command.Builder.Applicable<GeyserCommandSource> meta() {
return builder -> builder
.meta(CommandMeta.DESCRIPTION, GeyserLocale.getLocaleStringLog(description))
.meta(BEDROCK_ONLY, isBedrockOnly())