🐛 Fixed slash command execution on Minecraft 1.21+

DiSkyOrg · Aug 3, 2024 · 6716f5b · 6716f5b
1 parent c3598fa
commit 6716f5b
Showing 1 changed file with 26 additions and 22 deletions.
diff --git a/src/main/java/info/itsthesky/disky/elements/structures/slash/SlashManager.java b/src/main/java/info/itsthesky/disky/elements/structures/slash/SlashManager.java
@@ -3,6 +3,7 @@
 import ch.njol.skript.lang.Trigger;
 import info.itsthesky.disky.DiSky;
 import info.itsthesky.disky.core.Bot;
+import info.itsthesky.disky.core.SkriptUtils;
 import info.itsthesky.disky.elements.events.interactions.SlashCommandReceiveEvent;
 import info.itsthesky.disky.elements.events.interactions.SlashCompletionEvent;
 import info.itsthesky.disky.elements.structures.slash.elements.OnCooldownEvent;
@@ -22,6 +23,7 @@
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SlashCommandData;
 import net.dv8tion.jda.api.requests.RestAction;
+import org.bukkit.Bukkit;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -352,32 +354,34 @@ public void onSlashCommandInteraction(SlashCommandInteractionEvent event) {
 
     private void tryExecute(RegisteredCommand command, SlashCommandInteractionEvent event) {
 
-        // cooldown
-        if (command.getParsedCommand().hasCooldown()) {
-            if (command.isInCooldown(event.getUser())) {
-                if (command.getParsedCommand().getOnCooldown() != null) {
-                    final OnCooldownEvent.BukkitCooldownEvent bukkitEvent =
-                            new OnCooldownEvent.BukkitCooldownEvent(new OnCooldownEvent(),
-                                    command.getCooldown(event.getUser()) - System.currentTimeMillis());
-                    bukkitEvent.setJDAEvent(event);
-                    command.getParsedCommand().prepareArguments(event.getOptions());
-                    command.getParsedCommand().getOnCooldown().execute(bukkitEvent);
-
-                    if (!bukkitEvent.isCancelled())
-                        return;
+        SkriptUtils.sync(() -> {
+            // cooldown
+            if (command.getParsedCommand().hasCooldown()) {
+                if (command.isInCooldown(event.getUser())) {
+                    if (command.getParsedCommand().getOnCooldown() != null) {
+                        final OnCooldownEvent.BukkitCooldownEvent bukkitEvent =
+                                new OnCooldownEvent.BukkitCooldownEvent(new OnCooldownEvent(),
+                                        command.getCooldown(event.getUser()) - System.currentTimeMillis());
+                        bukkitEvent.setJDAEvent(event);
+                        command.getParsedCommand().prepareArguments(event.getOptions());
+                        command.getParsedCommand().getOnCooldown().execute(bukkitEvent);
+
+                        if (!bukkitEvent.isCancelled())
+                            return;
+                    }
                 }
-            }
 
-            command.setCooldown(event.getUser());
-        }
+                command.setCooldown(event.getUser());
+            }
 
-        // "real" execution
-        command.getParsedCommand().prepareArguments(event.getOptions());
-        final Trigger trigger = command.getParsedCommand().getTrigger();
-        final SlashCommandReceiveEvent.BukkitSlashCommandReceiveEvent bukkitEvent = new SlashCommandReceiveEvent.BukkitSlashCommandReceiveEvent(new SlashCommandReceiveEvent());
-        bukkitEvent.setJDAEvent(event);
+            // "real" execution
+            command.getParsedCommand().prepareArguments(event.getOptions());
+            final Trigger trigger = command.getParsedCommand().getTrigger();
+            final SlashCommandReceiveEvent.BukkitSlashCommandReceiveEvent bukkitEvent = new SlashCommandReceiveEvent.BukkitSlashCommandReceiveEvent(new SlashCommandReceiveEvent());
+            bukkitEvent.setJDAEvent(event);
 
-        trigger.execute(bukkitEvent);
+            trigger.execute(bukkitEvent);
+        });
     }
 
     @Override