Updated TrickCommand

Co-Authored-By: Matt <[email protected]>

Author: RealMangorage

build.gradle

@@ -72,7 +72,7 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter'
 
     installer('org.mangorage:installer:4.0.3')
-    bot('org.mangorage:mangobot:12.0.10')
+    bot('org.mangorage:mangobot:12.0.19')
 
     library('org.luaj:luaj-jse:3.0.1')
 }

src/main/java/module-info.java

@@ -6,6 +6,7 @@
 
     requires net.minecraftforge.eventbus;
     requires java.desktop;
+    requires annotations;
 
     exports org.mangorage.mangobotplugin.entrypoint;
     exports org.mangorage.mangobotplugin.commands.trick;

src/main/java/org/mangorage/mangobotplugin/commands/trick/TrickCommand.java

@@ -11,6 +11,7 @@
 import net.dv8tion.jda.api.interactions.components.text.TextInputStyle;
 import net.dv8tion.jda.api.interactions.modals.Modal;
 import net.dv8tion.jda.api.utils.MarkdownSanitizer;
+import org.jetbrains.annotations.Nullable;
 import org.mangorage.commonutils.data.DataHandler;
 import org.mangorage.commonutils.jda.MessageSettings;
 import org.mangorage.commonutils.jda.slash.command.Command;
@@ -544,12 +545,13 @@ public CommandResult execute(Message message, Arguments args) {
         return CommandResult.PASS;
     }
 
-    private void useTrick(Trick trick, Message message, MessageChannel channel, long guildID, Arguments args) {
+    private void useTrick(Trick trick, @Nullable 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"));
         }