SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow vanilla commands to be the main version of a command

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
CraftBukkit/Spigot
2014-02-12 20:44:14 +00:00
parent 8440092f32
commit 9c8d5eefd0
2 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View File

@ -491,8 +491,11 @@ public final class CraftServer implements Server {
}
if (type == PluginLoadOrder.POSTWORLD) {
// Spigot start - Allow vanilla commands to be forced to be the main command
this.setVanillaCommands(true);
this.commandMap.setFallbackCommands();
this.setVanillaCommands();
this.setVanillaCommands(false);
// Spigot end
this.commandMap.registerServerAliases();
DefaultPermissions.registerCorePermissions();
CraftDefaultPermissions.registerCorePermissions();
@ -506,12 +509,21 @@ public final class CraftServer implements Server {
this.pluginManager.disablePlugins();
}
private void setVanillaCommands() {
private void setVanillaCommands(boolean first) { // Spigot
Commands dispatcher = this.console.vanillaCommandDispatcher;
// Build a list of all Vanilla commands and create wrappers
for (CommandNode<CommandSourceStack> cmd : dispatcher.getDispatcher().getRoot().getChildren()) {
this.commandMap.register("minecraft", new VanillaCommandWrapper(dispatcher, cmd));
// Spigot start
VanillaCommandWrapper wrapper = new VanillaCommandWrapper(dispatcher, cmd);
if (org.spigotmc.SpigotConfig.replaceCommands.contains( wrapper.getName() ) ) {
if (first) {
this.commandMap.register("minecraft", wrapper);
}
} else if (!first) {
this.commandMap.register("minecraft", wrapper);
}
// Spigot end
}
}