|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Traveling-Trader <132439817+Traveling-Trader@users.noreply.github.com> |
| 3 | +Date: Fri, 22 May 2026 15:08:21 +0300 |
| 4 | +Subject: [PATCH] Delete some commands and aliases |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/io/papermc/paper/SparksFly.java b/src/main/java/io/papermc/paper/SparksFly.java |
| 8 | +index e504771ff2e599050b50d2d299a72a77c3b29477..2ae9fa5045c051672133de9c6a11e61b3f657da6 100644 |
| 9 | +--- a/src/main/java/io/papermc/paper/SparksFly.java |
| 10 | ++++ b/src/main/java/io/papermc/paper/SparksFly.java |
| 11 | +@@ -39,7 +39,6 @@ public final class SparksFly { |
| 12 | + private boolean disabledInConfigurationWarningLogged; |
| 13 | + |
| 14 | + public SparksFly(final Server server) { |
| 15 | +- // CleanPaper - disable backgroundProfiler by default in Spark config |
| 16 | + try { |
| 17 | + java.io.File sparkFolder = new java.io.File("plugins/spark"); |
| 18 | + java.io.File sparkConfig = new java.io.File(sparkFolder, "config.json"); |
| 19 | +@@ -57,7 +56,6 @@ public final class SparksFly { |
| 20 | + |
| 21 | + this.mainThreadTaskQueue = new ConcurrentLinkedQueue<>(); |
| 22 | + this.logger = Logger.getLogger(ID); |
| 23 | +- this.logger.log(Level.INFO, "This server bundles the spark profiler. For more information please visit https://docs.papermc.io/paper/profiling"); |
| 24 | + this.spark = PaperSparkModule.create(Compatibility.VERSION_1_0, server, this.logger, new PaperScheduler() { |
| 25 | + @Override |
| 26 | + public void executeAsync(final Runnable runnable) { |
| 27 | +diff --git a/src/main/java/io/papermc/paper/command/PaperCommands.java b/src/main/java/io/papermc/paper/command/PaperCommands.java |
| 28 | +index 6dfd0b1a85d518828b15158c01472ae4383b8882..8799558ba104cbca572e485b3e5e199a3b5e8fce 100644 |
| 29 | +--- a/src/main/java/io/papermc/paper/command/PaperCommands.java |
| 30 | ++++ b/src/main/java/io/papermc/paper/command/PaperCommands.java |
| 31 | +@@ -23,7 +23,6 @@ public final class PaperCommands { |
| 32 | + |
| 33 | + public static void registerCommands(final MinecraftServer server) { |
| 34 | + COMMANDS.put("paper", new PaperCommand("paper")); |
| 35 | +- COMMANDS.put("mspt", new MSPTCommand("mspt")); |
| 36 | + |
| 37 | + COMMANDS.forEach((s, command) -> { |
| 38 | + server.server.getCommandMap().register(s, "Paper", command); |
| 39 | +@@ -32,8 +31,8 @@ public final class PaperCommands { |
| 40 | + |
| 41 | + public static void registerCommands() { |
| 42 | + // Paper commands go here |
| 43 | +- registerInternalCommand(PaperVersionCommand.create(), "bukkit", PaperVersionCommand.DESCRIPTION, List.of("ver", "about"), Set.of()); |
| 44 | +- registerInternalCommand(PaperPluginsCommand.create(), "bukkit", PaperPluginsCommand.DESCRIPTION, List.of("pl"), Set.of()); |
| 45 | ++ registerInternalCommand(PaperVersionCommand.create(), "bukkit", PaperVersionCommand.DESCRIPTION, List.of("ver"), Set.of()); |
| 46 | ++ registerInternalCommand(PaperPluginsCommand.create(), "bukkit", PaperPluginsCommand.DESCRIPTION, List.of(), Set.of()); |
| 47 | + } |
| 48 | + |
| 49 | + private static void registerInternalCommand(final LiteralCommandNode<CommandSourceStack> node, final String namespace, final String description, final List<String> aliases, final Set<CommandRegistrationFlag> flags) { |
| 50 | +diff --git a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java |
| 51 | +index f37adc5dcad50a3e313c63ebee795161b4fa8b8f..0ce74e64c9fa061417716345f7be2ab770753d2d 100644 |
| 52 | +--- a/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java |
| 53 | ++++ b/src/main/java/io/papermc/paper/command/brigadier/PaperCommands.java |
| 54 | +@@ -97,30 +97,22 @@ public class PaperCommands implements Commands, PaperRegistrar<LifecycleEventOwn |
| 55 | + public @Unmodifiable Set<String> registerWithFlagsInternal(final @Nullable PluginMeta pluginMeta, final String namespace, final @Nullable String helpNamespaceOverride, final LiteralCommandNode<CommandSourceStack> node, final @Nullable String description, final Collection<String> aliases, final Set<CommandRegistrationFlag> flags) { |
| 56 | + final APICommandMeta meta = new APICommandMeta(pluginMeta, description, List.of(), helpNamespaceOverride); |
| 57 | + final String literal = node.getLiteral(); |
| 58 | +- final LiteralCommandNode<CommandSourceStack> pluginLiteral = PaperBrigadier.copyLiteral(namespace + ":" + literal, node); |
| 59 | + |
| 60 | +- final Set<String> registeredLabels = new HashSet<>(aliases.size() * 2 + 2); |
| 61 | ++ final Set<String> registeredLabels = new HashSet<>(aliases.size() + 1); |
| 62 | + |
| 63 | +- if (this.registerIntoDispatcher(pluginLiteral, true)) { |
| 64 | +- registeredLabels.add(pluginLiteral.getLiteral()); |
| 65 | +- } |
| 66 | + if (this.registerIntoDispatcher(node, true)) { // Plugin commands should override vanilla commands |
| 67 | + registeredLabels.add(literal); |
| 68 | + } |
| 69 | + |
| 70 | + // Add aliases |
| 71 | +- final List<String> registeredAliases = new ArrayList<>(aliases.size() * 2); |
| 72 | ++ final List<String> registeredAliases = new ArrayList<>(aliases.size()); |
| 73 | + for (final String alias : aliases) { |
| 74 | +- if (this.registerCopy(alias, pluginLiteral, meta)) { |
| 75 | ++ if (this.registerCopy(alias, node, meta)) { |
| 76 | + registeredAliases.add(alias); |
| 77 | + } |
| 78 | +- if (this.registerCopy(namespace + ":" + alias, pluginLiteral, meta)) { |
| 79 | +- registeredAliases.add(namespace + ":" + alias); |
| 80 | +- } |
| 81 | + } |
| 82 | + |
| 83 | +- pluginLiteral.apiCommandMeta = meta.withAliases(registeredAliases); |
| 84 | +- node.apiCommandMeta = pluginLiteral.apiCommandMeta; |
| 85 | ++ node.apiCommandMeta = meta.withAliases(registeredAliases); |
| 86 | + |
| 87 | + registeredLabels.addAll(registeredAliases); |
| 88 | + return registeredLabels.isEmpty() ? Collections.emptySet() : Collections.unmodifiableSet(registeredLabels); |
| 89 | +diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java |
| 90 | +index 82bd51ee07fb13efea0cb57a85df9d04bc487797..2a1c85837e112932415feaa491dec57cd0442119 100644 |
| 91 | +--- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java |
| 92 | ++++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java |
| 93 | +@@ -387,10 +387,4 @@ public class GlobalConfiguration extends ConfigurationPart { |
| 94 | + } |
| 95 | + } |
| 96 | + } |
| 97 | +- |
| 98 | +- public UpdateChecker updateChecker; |
| 99 | +- |
| 100 | +- public class UpdateChecker extends ConfigurationPart { |
| 101 | +- public boolean enabled = false; // CleanPaper - disabled by default, no update checking |
| 102 | +- } |
| 103 | + } |
| 104 | +diff --git a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java b/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java |
| 105 | +index 70b45a7d41f4bafac3b9738129d74af30e36b2a8..4a092d118cb4e90d9b179c8ecd5e9051934874ff 100644 |
| 106 | +--- a/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java |
| 107 | ++++ b/src/main/java/org/bukkit/craftbukkit/help/SimpleHelpMap.java |
| 108 | +@@ -64,6 +64,13 @@ public class SimpleHelpMap implements HelpMap { |
| 109 | + return this.helpTopics.get(topicName); |
| 110 | + } |
| 111 | + |
| 112 | ++ String cleanTopicName = topicName.startsWith("/") ? topicName.substring(1) : topicName; |
| 113 | ++ if (cleanTopicName.equalsIgnoreCase("CleanPaper") || cleanTopicName.equalsIgnoreCase("Bukkit") || cleanTopicName.equalsIgnoreCase("Paper") || cleanTopicName.equalsIgnoreCase("Spigot")) { |
| 114 | ++ if (this.helpTopics.containsKey("CleanPaper")) { |
| 115 | ++ return this.helpTopics.get("CleanPaper"); |
| 116 | ++ } |
| 117 | ++ } |
| 118 | ++ |
| 119 | + return null; |
| 120 | + } |
| 121 | + |
| 122 | +@@ -203,18 +210,31 @@ public class SimpleHelpMap implements HelpMap { |
| 123 | + return ((PluginIdentifiableCommand) command).getPlugin().getName(); |
| 124 | + } |
| 125 | + if (command instanceof VanillaCommandWrapper wrapper) { |
| 126 | +- return wrapper.helpCommandNamespace; |
| 127 | ++ String ns = wrapper.helpCommandNamespace; |
| 128 | ++ if ("Paper".equalsIgnoreCase(ns) || "Spigot".equalsIgnoreCase(ns) || "Bukkit".equalsIgnoreCase(ns)) { |
| 129 | ++ return "CleanPaper"; |
| 130 | ++ } |
| 131 | ++ return ns; |
| 132 | + } |
| 133 | + if (command instanceof BukkitCommand) { |
| 134 | +- return "Bukkit"; |
| 135 | ++ return "CleanPaper"; |
| 136 | + } |
| 137 | + return null; |
| 138 | + } |
| 139 | + |
| 140 | + private boolean commandInIgnoredPlugin(Command command, Set<String> ignoredPlugins) { |
| 141 | ++ if (ignoredPlugins.contains("CleanPaper")) { |
| 142 | ++ return true; |
| 143 | ++ } |
| 144 | + if ((command instanceof BukkitCommand) && ignoredPlugins.contains("Bukkit")) { |
| 145 | + return true; |
| 146 | + } |
| 147 | ++ if (command instanceof VanillaCommandWrapper wrapper) { |
| 148 | ++ String ns = wrapper.helpCommandNamespace; |
| 149 | ++ if (ns != null && ignoredPlugins.contains(ns)) { |
| 150 | ++ return true; |
| 151 | ++ } |
| 152 | ++ } |
| 153 | + if (command instanceof PluginIdentifiableCommand && ignoredPlugins.contains(((PluginIdentifiableCommand) command).getPlugin().getName())) { |
| 154 | + return true; |
| 155 | + } |
| 156 | +diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java |
| 157 | +index 025ec3f3e84a3367b4d709c8c3ecd98f6dfecab4..2048a5e90c9e86387d2caa9ee7ce1ca9c5e2ac34 100644 |
| 158 | +--- a/src/main/java/org/spigotmc/SpigotConfig.java |
| 159 | ++++ b/src/main/java/org/spigotmc/SpigotConfig.java |
| 160 | +@@ -66,7 +66,6 @@ public class SpigotConfig { |
| 161 | + SpigotConfig.config.options().copyDefaults(true); |
| 162 | + |
| 163 | + SpigotConfig.commands = new HashMap<>(); |
| 164 | +- SpigotConfig.commands.put("spigot", new SpigotCommand("spigot")); |
| 165 | + |
| 166 | + SpigotConfig.version = SpigotConfig.getInt("config-version", 13); |
| 167 | + SpigotConfig.set("config-version", 13); |
| 168 | +@@ -229,7 +228,6 @@ public class SpigotConfig { |
| 169 | + } |
| 170 | + |
| 171 | + private static void tpsCommand() { |
| 172 | +- SpigotConfig.commands.put("tps", new TicksPerSecondCommand("tps")); |
| 173 | + } |
| 174 | + |
| 175 | + public static int playerSample; |
0 commit comments