Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use console-source instead of RCON for commands. Fixes: #351

This commit is contained in:
Lukas Rieger (Blue) 2022-11-01 17:27:51 +01:00
parent 6213137894
commit 034d8b097a
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
implementations/spigot/src/main/java/de/bluecolored/bluemap/bukkit/BukkitCommands.java
View File

@ -32,8 +32,10 @@ import com.mojang.brigadier.tree.CommandNode;
import de.bluecolored.bluemap.common.plugin.Plugin;
import de.bluecolored.bluemap.common.plugin.commands.Commands;
import org.apache.commons.lang.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.RemoteConsoleCommandSender;
import org.bukkit.command.defaults.BukkitCommand;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -54,7 +56,14 @@ public class BukkitCommands implements Listener {
this.dispatcher = new CommandDispatcher<>();
// register commands
new Commands<>(plugin, dispatcher, bukkitSender -> new BukkitCommandSource(plugin, bukkitSender));
new Commands<>(plugin, dispatcher, bukkitSender -> {
// RCON doesn't work async, use console instead
if (bukkitSender instanceof RemoteConsoleCommandSender)
return new BukkitCommandSource(plugin, Bukkit.getConsoleSender());
return new BukkitCommandSource(plugin, bukkitSender);
});
}
public Collection<BukkitCommand> getRootCommands(){