summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-21 19:14:31 +1000
committermd_5 <git@md-5.net>2017-06-21 19:14:31 +1000
commit68cb4c61970e74a58e9c8a154f20d9dc046f02a6 (patch)
tree8bf7103228e4b5d7f6c1ce90e4dadb38e1f0420e /src
parent052c8e5eb578f9c62414f9002f8816e82a198cda (diff)
downloadbukkit-68cb4c61970e74a58e9c8a154f20d9dc046f02a6.tar
bukkit-68cb4c61970e74a58e9c8a154f20d9dc046f02a6.tar.gz
bukkit-68cb4c61970e74a58e9c8a154f20d9dc046f02a6.tar.lz
bukkit-68cb4c61970e74a58e9c8a154f20d9dc046f02a6.tar.xz
bukkit-68cb4c61970e74a58e9c8a154f20d9dc046f02a6.zip
Deprioritise Bukkit Commands
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/command/SimpleCommandMap.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 58313701..9969185c 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -95,7 +95,7 @@ public class SimpleCommandMap implements CommandMap {
*/
private synchronized boolean register(String label, Command command, boolean isAlias, String fallbackPrefix) {
knownCommands.put(fallbackPrefix + ":" + label, command);
- if (isAlias && knownCommands.containsKey(label)) {
+ if ((command instanceof BukkitCommand || isAlias) && knownCommands.containsKey(label)) {
// Request is for an alias/fallback command and it conflicts with
// a existing command or previous alias ignore it
// Note: This will mean it gets removed from the commands list of active aliases