From d84eb01498a2e105033a568e222c2512aaca3d84 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 21 Mar 2020 00:58:06 -0500 Subject: [PATCH] Make /ping a brigadier command --- patches/server/0106-Add-ping-command.patch | 157 +++++++++++++-------- 1 file changed, 98 insertions(+), 59 deletions(-) diff --git a/patches/server/0106-Add-ping-command.patch b/patches/server/0106-Add-ping-command.patch index 0813daca4..f40581aab 100644 --- a/patches/server/0106-Add-ping-command.patch +++ b/patches/server/0106-Add-ping-command.patch @@ -1,16 +1,82 @@ -From dcb2b9b35f5a492b9b8f683656100f8084305e89 Mon Sep 17 00:00:00 2001 +From 0c2841669fddfcd45b74f42350e0731531598d32 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 13 Mar 2020 22:29:10 -0500 Subject: [PATCH] Add /ping command --- - .../java/net/pl3x/purpur/PurpurConfig.java | 2 + - .../net/pl3x/purpur/command/PingCommand.java | 54 +++++++++++++++++++ - 2 files changed, 56 insertions(+) + .../net/minecraft/server/ArgumentEntity.java | 2 ++ + .../minecraft/server/CommandDispatcher.java | 5 ++- + .../server/CommandListenerWrapper.java | 1 + + .../java/net/pl3x/purpur/PurpurConfig.java | 1 + + .../net/pl3x/purpur/command/PingCommand.java | 35 +++++++++++++++++++ + 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 src/main/java/net/pl3x/purpur/command/PingCommand.java +diff --git a/src/main/java/net/minecraft/server/ArgumentEntity.java b/src/main/java/net/minecraft/server/ArgumentEntity.java +index 39a6a9ac00..5568649b7e 100644 +--- a/src/main/java/net/minecraft/server/ArgumentEntity.java ++++ b/src/main/java/net/minecraft/server/ArgumentEntity.java +@@ -69,10 +69,12 @@ public class ArgumentEntity implements ArgumentType { + return ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).c((CommandListenerWrapper) commandcontext.getSource()); + } + ++ public static ArgumentEntity players() { return d(); } // Purpur - OBFHELPER + public static ArgumentEntity d() { + return new ArgumentEntity(false, true); + } + ++ public static Collection getPlayers(CommandContext commandcontext, String s) throws CommandSyntaxException { return f(commandcontext, s); } // Purpur - OBFHELPER + public static Collection f(CommandContext commandcontext, String s) throws CommandSyntaxException { + List list = ((EntitySelector) commandcontext.getArgument(s, EntitySelector.class)).d((CommandListenerWrapper) commandcontext.getSource()); + +diff --git a/src/main/java/net/minecraft/server/CommandDispatcher.java b/src/main/java/net/minecraft/server/CommandDispatcher.java +index 37b1a7947c..b38a5223cb 100644 +--- a/src/main/java/net/minecraft/server/CommandDispatcher.java ++++ b/src/main/java/net/minecraft/server/CommandDispatcher.java +@@ -30,7 +30,7 @@ import org.bukkit.event.server.ServerCommandEvent; + public class CommandDispatcher { + + private static final Logger LOGGER = LogManager.getLogger(); +- private final com.mojang.brigadier.CommandDispatcher b = new com.mojang.brigadier.CommandDispatcher(); ++ private final com.mojang.brigadier.CommandDispatcher b = new com.mojang.brigadier.CommandDispatcher(); private com.mojang.brigadier.CommandDispatcher getDispatcher() { return b; } // Purpur - OBFHELPER + + // CraftBukkit start + public final CommandDispatcher init(boolean flag) { +@@ -106,6 +106,7 @@ public class CommandDispatcher { + CommandIdleTimeout.a(this.b); + CommandStop.a(this.b); + CommandWhitelist.a(this.b); ++ net.pl3x.purpur.command.PingCommand.register(getDispatcher()); // Purpur + } + + this.b.findAmbiguities((commandnode, commandnode1, commandnode2, collection) -> { +@@ -315,10 +316,12 @@ public class CommandDispatcher { + + } + ++ public static LiteralArgumentBuilder register(String s) { return a(s); } // Purpur - OBFHELPER + public static LiteralArgumentBuilder a(String s) { + return LiteralArgumentBuilder.literal(s); + } + ++ public static RequiredArgumentBuilder argument(String s, ArgumentType argumenttype) { return a(s, argumenttype); } // Purpur - OBFHELPER + public static RequiredArgumentBuilder a(String s, ArgumentType argumenttype) { + return RequiredArgumentBuilder.argument(s, argumenttype); + } +diff --git a/src/main/java/net/minecraft/server/CommandListenerWrapper.java b/src/main/java/net/minecraft/server/CommandListenerWrapper.java +index 0b23a0548d..ab0cf8b561 100644 +--- a/src/main/java/net/minecraft/server/CommandListenerWrapper.java ++++ b/src/main/java/net/minecraft/server/CommandListenerWrapper.java +@@ -159,6 +159,7 @@ public class CommandListenerWrapper implements ICompletionProvider { + } + } + ++ public EntityPlayer getPlayerOrException() throws CommandSyntaxException { return h(); } // Purpur - OBFHELPER + public EntityPlayer h() throws CommandSyntaxException { + if (!(this.k instanceof EntityPlayer)) { + throw CommandListenerWrapper.a.create(); diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java -index 63a91e7b7a..ca49b3b6a3 100644 +index 63a91e7b7a..f9f83e5b9a 100644 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java @@ -3,6 +3,7 @@ package net.pl3x.purpur; @@ -21,72 +87,45 @@ index 63a91e7b7a..ca49b3b6a3 100644 import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.configuration.InvalidConfigurationException; -@@ -55,6 +56,7 @@ public class PurpurConfig { - commands = new HashMap<>(); - commands.put("purpur", new PurpurCommand("purpur")); - commands.put("mspt", new MSPTCommand("mspt")); -+ commands.put("ping", new PingCommand("ping")); - - version = getInt("config-version", 4); - set("config-version", 4); diff --git a/src/main/java/net/pl3x/purpur/command/PingCommand.java b/src/main/java/net/pl3x/purpur/command/PingCommand.java new file mode 100644 -index 0000000000..54682dcf47 +index 0000000000..883b68a5cf --- /dev/null +++ b/src/main/java/net/pl3x/purpur/command/PingCommand.java -@@ -0,0 +1,54 @@ +@@ -0,0 +1,35 @@ +package net.pl3x.purpur.command; + -+import org.bukkit.Bukkit; ++ ++import com.mojang.brigadier.exceptions.CommandSyntaxException; ++import net.minecraft.server.ArgumentEntity; ++import net.minecraft.server.ChatMessage; ++import net.minecraft.server.CommandDispatcher; ++import net.minecraft.server.CommandListenerWrapper; ++import net.minecraft.server.EntityPlayer; +import org.bukkit.ChatColor; -+import org.bukkit.command.CommandSender; -+import org.bukkit.command.defaults.BukkitCommand; -+import org.bukkit.entity.HumanEntity; -+import org.bukkit.entity.Player; + -+import java.util.List; -+import java.util.stream.Collectors; ++import java.util.Collection; ++import java.util.Collections; + -+public class PingCommand extends BukkitCommand { -+ public PingCommand(String name) { -+ super(name); -+ -+ this.description = "Gets player ping"; -+ this.usageMessage = "/ping (player)"; -+ this.setPermission("bukkit.command.ping"); ++public class PingCommand { ++ public static void register(com.mojang.brigadier.CommandDispatcher dispatcher) { ++ dispatcher.register(CommandDispatcher.register("ping") ++ .requires((listener) -> { ++ return listener.hasPermission(2, "bukkit.command.ping"); ++ }) ++ .executes((context) -> { ++ return execute(context.getSource(), Collections.singleton(context.getSource().getPlayerOrException())); ++ }) ++ .then(CommandDispatcher.argument("targets", ArgumentEntity.players()).executes((context) -> { ++ return execute(context.getSource(), ArgumentEntity.getPlayers(context, "targets")); ++ }))); + } + -+ @Override -+ public List tabComplete(CommandSender sender, String alias, String[] args) { -+ return Bukkit.getOnlinePlayers().stream() -+ .filter(player -> player.getName().toLowerCase().startsWith(args[0].toLowerCase())) -+ .map(HumanEntity::getName).collect(Collectors.toList()); -+ } -+ -+ @Override -+ public boolean execute(CommandSender sender, String currentAlias, String[] args) { -+ if (!testPermission(sender)) { -+ return true; ++ private static int execute(CommandListenerWrapper sender, Collection targets) throws CommandSyntaxException { ++ for (EntityPlayer player : targets) { ++ sender.sendMessage(new ChatMessage(ChatColor.GREEN + "%s's ping is %sms", player.getScoreboardDisplayName(), player.ping), false); + } -+ -+ if (args.length == 0) { -+ if (!(sender instanceof Player)) { -+ sender.sendMessage(ChatColor.RED + "Player only command"); -+ return true; -+ } -+ Player player = (Player) sender; -+ sender.sendMessage(ChatColor.GREEN + "Your ping is " + player.spigot().getPing() + "ms"); -+ return true; -+ } -+ -+ Player player = Bukkit.getPlayer(args[0]); -+ if (player == null) { -+ sender.sendMessage(ChatColor.RED + "Player not online"); -+ return true; -+ } -+ -+ sender.sendMessage(ChatColor.GREEN + player.getName() + "'s ping is " + player.spigot().getPing() + "ms"); -+ return true; ++ return targets.size(); + } +} --