80 lines
3.3 KiB
Diff
80 lines
3.3 KiB
Diff
From f39456a4ac98fa1d30590b9dd850a7181f73c0c0 Mon Sep 17 00:00:00 2001
|
|
From: Thinkofdeath <thethinkofdeath@gmail.com>
|
|
Date: Wed, 12 Feb 2014 20:44:14 +0000
|
|
Subject: [PATCH] Allow vanilla commands to be the main version of a command
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
index 4c4a090..103ace8 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
@@ -318,8 +318,11 @@ public final class CraftServer implements Server {
|
|
}
|
|
|
|
if (type == PluginLoadOrder.POSTWORLD) {
|
|
+ // Spigot start - Allow vanilla commands to be forced to be the main command
|
|
+ setVanillaCommands(true);
|
|
commandMap.setFallbackCommands();
|
|
- setVanillaCommands();
|
|
+ setVanillaCommands(false);
|
|
+ // Spigot end
|
|
commandMap.registerServerAliases();
|
|
loadCustomPermissions();
|
|
DefaultPermissions.registerCorePermissions();
|
|
@@ -332,10 +335,19 @@ public final class CraftServer implements Server {
|
|
pluginManager.disablePlugins();
|
|
}
|
|
|
|
- private void setVanillaCommands() {
|
|
+ private void setVanillaCommands(boolean first) { // Spigot
|
|
Map<String, ICommand> commands = new CommandDispatcher().getCommands();
|
|
for (ICommand cmd : commands.values()) {
|
|
- commandMap.register("minecraft", new VanillaCommandWrapper((CommandAbstract) cmd, LocaleI18n.get(cmd.getUsage(null))));
|
|
+ // Spigot start
|
|
+ VanillaCommandWrapper wrapper = new VanillaCommandWrapper((CommandAbstract) cmd, LocaleI18n.get(cmd.getUsage(null)));
|
|
+ if (org.spigotmc.SpigotConfig.replaceCommands.contains( wrapper.getName() ) ) {
|
|
+ if (first) {
|
|
+ commandMap.register("minecraft", wrapper);
|
|
+ }
|
|
+ } else if (!first) {
|
|
+ commandMap.register("minecraft", wrapper);
|
|
+ }
|
|
+ // Spigot end
|
|
}
|
|
}
|
|
|
|
diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
index 686b8bd..3a8734f 100644
|
|
--- a/src/main/java/org/spigotmc/SpigotConfig.java
|
|
+++ b/src/main/java/org/spigotmc/SpigotConfig.java
|
|
@@ -8,8 +8,10 @@ import java.lang.reflect.Method;
|
|
import java.lang.reflect.Modifier;
|
|
import java.util.Arrays;
|
|
import java.util.HashMap;
|
|
+import java.util.HashSet;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
+import java.util.Set;
|
|
import java.util.logging.Level;
|
|
import gnu.trove.map.hash.TObjectIntHashMap;
|
|
import net.minecraft.server.MinecraftServer;
|
|
@@ -302,4 +304,16 @@ public class SpigotConfig
|
|
{
|
|
filterCreativeItems = getBoolean( "settings.filter-creative-items", true );
|
|
}
|
|
+
|
|
+ public static Set<String> replaceCommands;
|
|
+ private static void replaceCommands()
|
|
+ {
|
|
+ if ( config.contains( "replace-commands" ) )
|
|
+ {
|
|
+ set( "commands.replace-commands", config.getStringList( "replace-commands" ) );
|
|
+ config.set( "replace-commands", null );
|
|
+ }
|
|
+ replaceCommands = new HashSet<String>( (List<String>) getList( "commands.replace-commands",
|
|
+ Arrays.asList( "setblock", "summon", "testforblock", "tellraw" ) ) );
|
|
+ }
|
|
}
|
|
--
|
|
2.1.4
|
|
|