Upstream/CommandPanels
2
0
Fork 1
mirror of https://github.com/rockyhawk64/CommandPanels.git synced 2025-11-18 07:14:17 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix commands running before panel opens

Browse Source
This commit is contained in:
rockyhawk64 2025-10-14 17:46:17 +11:00
parent f5993c525a
commit 4408bacc7e
5 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/me/rockyhawk/commandpanels/interaction/commands/CommandRunner.java
View File

@ -47,7 +47,6 @@ public class CommandRunner {
String command = commands.get(index).trim(); String command = commands.get(index).trim();
// Handle the delay tag at flow level
if (command.startsWith("[delay]")) { if (command.startsWith("[delay]")) {
String delayStr = ctx.text.applyPlaceholders( String delayStr = ctx.text.applyPlaceholders(
player, player,
@ -70,10 +69,7 @@ public class CommandRunner {
} }
// Run the command // Run the command
Bukkit.getGlobalRegionScheduler().run( runCommand(panel, player, command);
ctx.plugin,
task -> runCommand(panel, player, command)
);
// Move to the next command // Move to the next command
runCommands(panel, player, commands, index + 1); runCommands(panel, player, commands, index + 1);

1
src/me/rockyhawk/commandpanels/interaction/commands/tags/ChatTag.java
View File

@ -3,7 +3,6 @@ package me.rockyhawk.commandpanels.interaction.commands.tags;
import me.rockyhawk.commandpanels.Context; import me.rockyhawk.commandpanels.Context;
import me.rockyhawk.commandpanels.interaction.commands.CommandTagResolver; import me.rockyhawk.commandpanels.interaction.commands.CommandTagResolver;
import me.rockyhawk.commandpanels.session.Panel; import me.rockyhawk.commandpanels.session.Panel;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class ChatTag implements CommandTagResolver { public class ChatTag implements CommandTagResolver {

4
src/me/rockyhawk/commandpanels/interaction/commands/tags/ConsoleCmdTag.java
View File

@ -15,6 +15,8 @@ public class ConsoleCmdTag implements CommandTagResolver {
@Override @Override
public void handle(Context ctx, Panel panel, Player player, String raw, String command) { public void handle(Context ctx, Panel panel, Player player, String raw, String command) {
Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command); Bukkit.getGlobalRegionScheduler().run(ctx.plugin,
task -> Bukkit.dispatchCommand(Bukkit.getConsoleSender(), command)
);
} }
} }

6
src/me/rockyhawk/commandpanels/interaction/commands/tags/RefreshPanelTag.java
View File

@ -19,8 +19,8 @@ public class RefreshPanelTag implements CommandTagResolver {
*/ */
@Override @Override
public void handle(Context ctx, Panel panel, Player player, String raw, String command) { public void handle(Context ctx, Panel panel, Player player, String raw, String command) {
Bukkit.getGlobalRegionScheduler().run(ctx.plugin, task -> { Bukkit.getGlobalRegionScheduler().run(ctx.plugin, task ->
panel.open(ctx, player, false); panel.open(ctx, player, false)
}); );
} }
} }

1
src/me/rockyhawk/commandpanels/session/inventory/listeners/ClickEvents.java
View File

@ -6,7 +6,6 @@ import me.rockyhawk.commandpanels.interaction.commands.RequirementRunner;
import me.rockyhawk.commandpanels.session.ClickActions; import me.rockyhawk.commandpanels.session.ClickActions;
import me.rockyhawk.commandpanels.session.inventory.InventoryPanel; import me.rockyhawk.commandpanels.session.inventory.InventoryPanel;
import me.rockyhawk.commandpanels.session.inventory.PanelItem; import me.rockyhawk.commandpanels.session.inventory.PanelItem;
import org.bukkit.Bukkit;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event; import org.bukkit.event.Event;