From e227e22ed3999182b450dd897669e7ad9922d03e Mon Sep 17 00:00:00 2001 From: Darkere Date: Thu, 2 Apr 2020 11:06:04 +0200 Subject: Make spark work from Forge console (#40) --- .../java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'spark-forge/src/main/java') diff --git a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java index 27489fb..c017d95 100644 --- a/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java +++ b/spark-forge/src/main/java/me/lucko/spark/forge/plugin/ForgeServerSparkPlugin.java @@ -67,7 +67,7 @@ public class ForgeServerSparkPlugin extends ForgeSparkPlugin implements Command< private static String /* Nullable */[] processArgs(CommandContext context) { String[] split = context.getInput().split(" "); - if (split.length == 0 || !split[0].equals("/spark")) { + if (split.length == 0 || !split[0].equals("/spark") && !split[0].equals("spark")) { return null; } @@ -79,8 +79,8 @@ public class ForgeServerSparkPlugin extends ForgeSparkPlugin implements Command< String[] args = processArgs(context); if (args == null) return 0; - - this.platform.executeCommand(new ForgeCommandSender(context.getSource().asPlayer(), this), args); + ICommandSource source = context.getSource().getEntity() instanceof ServerPlayerEntity ? context.getSource().asPlayer() : context.getSource().getServer(); + this.platform.executeCommand(new ForgeCommandSender(source, this), args); return Command.SINGLE_SUCCESS; } -- cgit