Skip to content

Ensure dynamic Bukkit command dispatch runs on Folia entity threads #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Chwitst187 wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −0
Open

Ensure dynamic Bukkit command dispatch runs on Folia entity threads #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions worldedit-bukkit/src/main/java/com/sk89q/bukkit/util/DynamicPluginCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,16 @@
package com.sk89q.bukkit.util;

import com.sk89q.minecraft.util.commands.CommandsManager;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import com.sk89q.worldedit.bukkit.util.FoliaEntityTask;
import com.sk89q.util.StringUtil;
import com.sk89q.wepif.PermissionsResolverManager;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.PluginIdentifiableCommand;
import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;

import java.util.Arrays;
Expand Down Expand Up @@ -59,6 +62,9 @@ public DynamicPluginCommand(

@Override
public boolean execute(CommandSender sender, String label, String[] args) {
if (WorldEditPlugin.getInstance().isOnFolia() && sender instanceof Player player) {
return FoliaEntityTask.execute(player, () -> owner.onCommand(sender, this, label, args)).join();
}
return owner.onCommand(sender, this, label, args);
}

Expand Down Expand Up @@ -89,6 +95,9 @@ public Plugin getPlugin() {
@Override
public List<String> tabComplete(CommandSender sender, String alias, String[] args) throws IllegalArgumentException {
if (registeredWith instanceof CommandInspector) {
if (WorldEditPlugin.getInstance().isOnFolia() && sender instanceof Player player) {
return FoliaEntityTask.execute(player, () -> ((TabCompleter) owner).onTabComplete(sender, this, alias, args)).join();
}
return ((TabCompleter) owner).onTabComplete(sender, this, alias, args);
} else {
return super.tabComplete(sender, alias, args);
Expand Down