OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-16 06:30:46 +01:00
Code Issues Projects Releases Packages Wiki Activity

Updated plugin commands to allow for aliases and fallback on name collision.

Browse source 
By: VictorD <victor.danell@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2011-01-18 01:13:45 +01:00
parent 77cff3ea87
commit 6e823e9992
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
paper-server/src/main/java/org/bukkit/craftbukkit/CraftServer.java
View file

@ -1,5 +1,9 @@
package org.bukkit.craftbukkit; package org.bukkit.craftbukkit;
import org.bukkit.command.Command;
import org.bukkit.command.CommandMap;
import org.bukkit.command.SimpleCommandMap;
import org.bukkit.command.PluginCommandYamlParser;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -10,10 +14,8 @@ import net.minecraft.server.EntityPlayerMP;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerConfigurationManager; import net.minecraft.server.ServerConfigurationManager;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.plugin.CommandManager;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.PluginManager;
import org.bukkit.plugin.SimpleCommandManager;
import org.bukkit.plugin.SimplePluginManager; import org.bukkit.plugin.SimplePluginManager;
import org.bukkit.plugin.java.JavaPluginLoader; import org.bukkit.plugin.java.JavaPluginLoader;
@ -22,7 +24,7 @@ public final class CraftServer implements Server
private final String serverName = "Craftbukkit"; private final String serverName = "Craftbukkit";
private final String serverVersion = "1.2_01"; private final String serverVersion = "1.2_01";
private final PluginManager pluginManager = new SimplePluginManager(this); private final PluginManager pluginManager = new SimplePluginManager(this);
private final CommandManager commandManager = new SimpleCommandManager(); private final CommandMap commandMap = new SimpleCommandMap();
protected final MinecraftServer console; protected final MinecraftServer console;
protected final ServerConfigurationManager server; protected final ServerConfigurationManager server;
@ -34,18 +36,13 @@ public final class CraftServer implements Server
} }
public void loadPlugins() { public void loadPlugins() {
File pluginFolder = (File) console.options.valueOf("plugins"); File pluginFolder = (File)console.options.valueOf("plugins");
if (pluginFolder.exists()) { if (pluginFolder.exists()) {
try { try {
Plugin[] plugins = pluginManager.loadPlugins(pluginFolder); Plugin[] plugins = pluginManager.loadPlugins(pluginFolder);
for (Plugin plugin : plugins) { for (Plugin plugin : plugins) {
if (commandManager.registerCommands(plugin)) { loadPlugin(plugin);
pluginManager.enablePlugin(plugin);
} else {
Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, "Plugin " + plugin.getDescription().getName() + " failed to load. Reason: Requested commands already in use.");
}
} }
} catch (Throwable ex) { } catch (Throwable ex) {
Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " (Is it up to date?)", ex); Logger.getLogger(CraftServer.class.getName()).log(Level.SEVERE, ex.getMessage() + " (Is it up to date?)", ex);
@ -55,6 +52,14 @@ public final class CraftServer implements Server
} }
} }
private void loadPlugin(Plugin plugin) {
List<Command> pluginCommands = PluginCommandYamlParser.parse(plugin);
if (!pluginCommands.isEmpty()) {
commandMap.registerAll(plugin.getDescription().getName(), pluginCommands);
}
pluginManager.enablePlugin(plugin);
}
public String getName() { public String getName() {
return serverName; return serverName;
} }
@ -148,7 +153,7 @@ public final class CraftServer implements Server
return server; return server;
} }
public boolean dispatchCommand(Player player, String cmd) { public boolean dispatchCommand(Player player, String commandLine) {
return commandManager.dispatchCommand(player, cmd); return commandMap.dispatch(player, commandLine);
} }
} }