From 7497f91084b5a0b220e3c32612803fc0bfd2fc6e Mon Sep 17 00:00:00 2001 From: Luck Date: Mon, 14 Dec 2020 20:45:12 +0000 Subject: Detect RCON consoles correctly --- .../src/main/java/me/lucko/spark/fabric/FabricCommandSender.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'spark-fabric/src/main/java') diff --git a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java index c2c5c77..7a176fa 100644 --- a/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java +++ b/spark-fabric/src/main/java/me/lucko/spark/fabric/FabricCommandSender.java @@ -25,8 +25,9 @@ import me.lucko.spark.fabric.plugin.FabricSparkPlugin; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandOutput; -import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.server.rcon.RconCommandOutput; import net.minecraft.text.Text; import java.util.UUID; @@ -45,8 +46,10 @@ public class FabricCommandSender extends AbstractCommandSender { public String getName() { if (super.delegate instanceof PlayerEntity) { return ((PlayerEntity) super.delegate).getGameProfile().getName(); - } else if (super.delegate instanceof DedicatedServer) { + } else if (super.delegate instanceof MinecraftServer) { return "Console"; + } else if (super.delegate instanceof RconCommandOutput) { + return "RCON Console"; } else { return "unknown:" + super.delegate.getClass().getSimpleName(); } -- cgit