Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7125: Command execution exceptions are not logged

Browse Source
This commit is contained in:
md_5 2022-07-29 16:13:34 +10:00
parent 6398146835
commit 40eaff8a51
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/bukkit/craftbukkit/command/BukkitCommandWrapper.java
View File

@ -13,8 +13,11 @@ import com.mojang.brigadier.tree.LiteralCommandNode;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.logging.Level;
import net.minecraft.commands.CommandListenerWrapper; import net.minecraft.commands.CommandListenerWrapper;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandException;
import org.bukkit.command.CommandSender;
import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftServer;
public class BukkitCommandWrapper implements com.mojang.brigadier.Command<CommandListenerWrapper>, Predicate<CommandListenerWrapper>, SuggestionProvider<CommandListenerWrapper> { public class BukkitCommandWrapper implements com.mojang.brigadier.Command<CommandListenerWrapper>, Predicate<CommandListenerWrapper>, SuggestionProvider<CommandListenerWrapper> {
@ -41,7 +44,15 @@ public class BukkitCommandWrapper implements com.mojang.brigadier.Command<Comman
@Override @Override
public int run(CommandContext<CommandListenerWrapper> context) throws CommandSyntaxException { public int run(CommandContext<CommandListenerWrapper> context) throws CommandSyntaxException {
return server.dispatchCommand(context.getSource().getBukkitSender(), context.getInput()) ? 1 : 0; CommandSender sender = context.getSource().getBukkitSender();
try {
return server.dispatchCommand(sender, context.getInput()) ? 1 : 0;
} catch (CommandException ex) {
sender.sendMessage(org.bukkit.ChatColor.RED + "An internal error occurred while attempting to perform this command");
server.getLogger().log(Level.SEVERE, null, ex);
return 0;
}
} }
@Override @Override