From 7fe69c305e7d77dfd5b3afea674171fae419b8e8 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Sun, 26 May 2024 16:55:42 -0500 Subject: [PATCH] fix npes --- .../plex/medina/command/impl/ReportsCommand.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/dev/plex/medina/command/impl/ReportsCommand.java b/src/main/java/dev/plex/medina/command/impl/ReportsCommand.java index 6bb7a37..d094f24 100644 --- a/src/main/java/dev/plex/medina/command/impl/ReportsCommand.java +++ b/src/main/java/dev/plex/medina/command/impl/ReportsCommand.java @@ -17,13 +17,13 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -@CommandParameters(name = "reports", usage = "/ | delete >", description = "View existing reports on a player", permission = "medina.reports", source = RequiredCommandSource.ANY) +@CommandParameters(name = "reports", usage = "/ >", description = "View existing reports on a player", permission = "medina.reports", source = RequiredCommandSource.ANY) public class ReportsCommand extends MedinaCommand { @Override protected Component execute(@NotNull CommandSender sender, @Nullable Player playerSender, @NotNull String[] args) { - if (args.length == 0) + if (args.length < 2) { return usage(); } @@ -56,9 +56,18 @@ public class ReportsCommand extends MedinaCommand } case "delete": { + if (args.length < 3) + { + return usage(); + } int id = parseInt(sender, args[2]); plugin.getSqlReports().getReports(id).whenComplete(((report, ex) -> { + if (report == null) + { + send(sender, messageComponent("reportDoesntExist")); + return; + } if (report.isDeleted()) { send(sender, messageComponent("reportDoesntExist"));