mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-15 07:01:36 +08:00
5729bc716e
If a server enables Anti Xray, packet sending can be delayed until the chunk has been obfuscated, blocking the entire queue from going out. On a busy server, considering Anti Xray can only operate on a single thread, it is quite possible the obfuscation backlog can get quite behind resulting in a delay of sending packets. And logging in is a clear area where lots of chunks are going to be queued for obfuscation.... We should probably special case a few more than this (such as chat), but this will hopefully help the keep alive issues some people run into.
112 lines
4.5 KiB
Diff
112 lines
4.5 KiB
Diff
From dad171c74df2dc24940141bce47acdc433258603 Mon Sep 17 00:00:00 2001
|
|
From: willies952002 <admin@domnian.com>
|
|
Date: Mon, 28 Nov 2016 10:16:39 -0500
|
|
Subject: [PATCH] Allow Reloading of Command Aliases
|
|
|
|
Reload the aliases stored in commands.yml
|
|
|
|
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
|
|
index 423fecf54..0ec517701 100644
|
|
--- a/src/main/java/org/bukkit/Bukkit.java
|
|
+++ b/src/main/java/org/bukkit/Bukkit.java
|
|
@@ -1581,6 +1581,15 @@ public final class Bukkit {
|
|
public static void reloadPermissions() {
|
|
server.reloadPermissions();
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Reload the Command Aliases in commands.yml
|
|
+ *
|
|
+ * @return Whether the reload was successful
|
|
+ */
|
|
+ public static boolean reloadCommandAliases() {
|
|
+ return server.reloadCommandAliases();
|
|
+ }
|
|
// Paper end
|
|
|
|
@NotNull
|
|
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
|
|
index 38d7da737..93bb91fad 100644
|
|
--- a/src/main/java/org/bukkit/Server.java
|
|
+++ b/src/main/java/org/bukkit/Server.java
|
|
@@ -1390,4 +1390,6 @@ public interface Server extends PluginMessageRecipient {
|
|
// Spigot end
|
|
|
|
void reloadPermissions(); // Paper
|
|
+
|
|
+ boolean reloadCommandAliases(); // Paper
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/command/CommandMap.java b/src/main/java/org/bukkit/command/CommandMap.java
|
|
index bd2c7a696..864c263bb 100644
|
|
--- a/src/main/java/org/bukkit/command/CommandMap.java
|
|
+++ b/src/main/java/org/bukkit/command/CommandMap.java
|
|
@@ -128,4 +128,14 @@ public interface CommandMap {
|
|
*/
|
|
@Nullable
|
|
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String cmdLine, @Nullable Location location) throws IllegalArgumentException;
|
|
+
|
|
+ // Paper start - Expose Known Commands
|
|
+ /**
|
|
+ * Return a Map of known commands
|
|
+ *
|
|
+ * @return known commands
|
|
+ */
|
|
+ @NotNull
|
|
+ public java.util.Map<String, Command> getKnownCommands();
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
index adfc7aae2..460fda05a 100644
|
|
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
|
@@ -297,4 +297,11 @@ public class SimpleCommandMap implements CommandMap {
|
|
}
|
|
}
|
|
}
|
|
+
|
|
+ // Paper start - Expose Known Commands
|
|
+ @NotNull
|
|
+ public Map<String, Command> getKnownCommands() {
|
|
+ return knownCommands;
|
|
+ }
|
|
+ // Paper end
|
|
}
|
|
diff --git a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
|
index c62da4131..0c7ba0718 100644
|
|
--- a/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
|
+++ b/src/main/java/org/bukkit/command/defaults/ReloadCommand.java
|
|
@@ -13,7 +13,7 @@ public class ReloadCommand extends BukkitCommand {
|
|
public ReloadCommand(@NotNull String name) {
|
|
super(name);
|
|
this.description = "Reloads the server configuration and plugins";
|
|
- this.usageMessage = "/reload [permissions]"; // Paper
|
|
+ this.usageMessage = "/reload [permissions|commands|confirm]"; // Paper
|
|
this.setPermission("bukkit.command.reload");
|
|
this.setAliases(Arrays.asList("rl"));
|
|
}
|
|
@@ -29,6 +29,13 @@ public class ReloadCommand extends BukkitCommand {
|
|
Bukkit.getServer().reloadPermissions();
|
|
Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Permissions successfully reloaded.");
|
|
return true;
|
|
+ } else if ("commands".equalsIgnoreCase(args[0])) {
|
|
+ if (Bukkit.getServer().reloadCommandAliases()) {
|
|
+ Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Command aliases successfully reloaded.");
|
|
+ } else {
|
|
+ Command.broadcastCommandMessage(sender, ChatColor.RED + "An error occurred while trying to reload command aliases.");
|
|
+ }
|
|
+ return true;
|
|
} else if ("confirm".equalsIgnoreCase(args[0])) {
|
|
confirmed = true;
|
|
} else {
|
|
@@ -53,6 +60,6 @@ public class ReloadCommand extends BukkitCommand {
|
|
@NotNull
|
|
@Override
|
|
public List<String> tabComplete(@NotNull CommandSender sender, @NotNull String alias, @NotNull String[] args) throws IllegalArgumentException {
|
|
- return java.util.Collections.singletonList("permissions"); // Paper
|
|
+ return com.google.common.collect.Lists.newArrayList("permissions", "commands"); // Paper
|
|
}
|
|
}
|
|
--
|
|
2.26.2
|
|
|