Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-06 16:37:38 +01:00
Code Issues Projects Releases Wiki Activity

hollow-cube/command-virtual-execution

Browse Source
This commit is contained in:
mworzala 2023-05-06 09:28:02 +03:00
parent 984df871fb
commit 2469922ad7
No known key found for this signature in database
GPG Key ID: B148F922E64797C7
1 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/main/java/net/minestom/server/command/CommandManager.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.command;
import net.minestom.server.MinecraftServer;
import net.minestom.server.command.builder.Command;
import net.minestom.server.command.builder.CommandDispatcher;
import net.minestom.server.command.builder.CommandResult;
@ -13,7 +14,9 @@ import net.minestom.server.utils.validate.Check;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.Callable;
/**
* Manager used to register {@link Command commands}.
@ -21,6 +24,7 @@ import java.util.*;
* It is also possible to simulate a command using {@link #execute(CommandSender, String)}.
*/
public final class CommandManager {
private static final boolean ASYNC_VIRTUAL = Boolean.getBoolean("minestom.command.async-virtual");
public static final String COMMAND_PREFIX = "/";
@ -97,27 +101,56 @@ public final class CommandManager {
* @param command the raw command string (without the command prefix)
* @return the execution result
*/
public @NotNull CommandResult execute(@NotNull CommandSender sender, @NotNull String command) {
command = command.trim();
// Command event
if (sender instanceof Player player) {
PlayerCommandEvent playerCommandEvent = new PlayerCommandEvent(player, command);
EventDispatcher.call(playerCommandEvent);
if (playerCommandEvent.isCancelled())
return CommandResult.of(CommandResult.Type.CANCELLED, command);
command = playerCommandEvent.getCommand();
}
// Process the command
final CommandParser.Result parsedCommand = parseCommand(sender, command);
final ExecutableCommand executable = parsedCommand.executable();
final ExecutableCommand.Result executeResult = executable.execute(sender);
final CommandResult result = resultConverter(executable, executeResult, command);
if (result.getType() == CommandResult.Type.UNKNOWN) {
if (unknownCommandCallback != null) {
this.unknownCommandCallback.apply(sender, command);
public @NotNull CommandResult execute(@NotNull CommandSender sender, @NotNull String rawCommand) {
Callable<CommandResult> callable = () -> {
var command = rawCommand.trim();
// Command event
if (sender instanceof Player player) {
PlayerCommandEvent playerCommandEvent = new PlayerCommandEvent(player, command);
EventDispatcher.call(playerCommandEvent);
if (playerCommandEvent.isCancelled())
return CommandResult.of(CommandResult.Type.CANCELLED, command);
command = playerCommandEvent.getCommand();
}
// Process the command
final CommandParser.Result parsedCommand = parseCommand(sender, command);
final ExecutableCommand executable = parsedCommand.executable();
final ExecutableCommand.Result executeResult = executable.execute(sender);
final CommandResult result = resultConverter(executable, executeResult, command);
if (result.getType() == CommandResult.Type.UNKNOWN) {
if (unknownCommandCallback != null) {
this.unknownCommandCallback.apply(sender, command);
}
}
return result;
};
try {
if (ASYNC_VIRTUAL) {
class Reflection {
static Method startVirtualThread = null;
}
if (Reflection.startVirtualThread == null) {
Reflection.startVirtualThread = Thread.class.getDeclaredMethod("startVirtualThread", Runnable.class);
Reflection.startVirtualThread.setAccessible(true);
}
Reflection.startVirtualThread.invoke(null, (Runnable) () -> {
try {
callable.call();
} catch (Exception e) {
MinecraftServer.getExceptionManager().handleException(e);
}
});
return CommandResult.of(CommandResult.Type.UNKNOWN, rawCommand);
} else {
return callable.call();
}
} catch (Exception e) {
MinecraftServer.getExceptionManager().handleException(e);
return CommandResult.of(CommandResult.Type.UNKNOWN, rawCommand);
}
return result;
}
/**