From 27c79e6613af1d1a5a042256a559affc3e3eb4e5 Mon Sep 17 00:00:00 2001 From: Fealtous Date: Sat, 19 Apr 2025 10:56:48 -0400 Subject: [PATCH] useTrick message non-null is apparently a lie --- .../org/mangorage/mangobot/modules/tricks/TrickCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/mangorage/mangobot/modules/tricks/TrickCommand.java b/src/main/java/org/mangorage/mangobot/modules/tricks/TrickCommand.java index fc1da3a..110864b 100644 --- a/src/main/java/org/mangorage/mangobot/modules/tricks/TrickCommand.java +++ b/src/main/java/org/mangorage/mangobot/modules/tricks/TrickCommand.java @@ -550,9 +550,10 @@ public CommandResult execute(Message message, Arguments args) { private void useTrick(Trick trick, Message message, MessageChannel channel, long guildID, Arguments args) { MessageSettings dMessage = plugin.getMessageSettings(); var type = trick.getType(); - var replyTarget = message.getMessageReference() == null ? null : message.getMessageReference().getMessage(); + var replyTarget = message == null ? null : (message.getMessageReference() == null ? null : message.getMessageReference().getMessage()); boolean shouldPing = false; if (replyTarget != null && replyTarget.getMember() != null) { + // No ping if hoisted UNLESS not staff. shouldPing = replyTarget.getMember().getRoles() .stream().noneMatch((role) -> role.isHoisted() ^ role.getName().equals("Patreons")); }