Update upstream B/CB/S
This commit is contained in:
parent
c9f4b402ff
commit
8a45451a97
4 changed files with 3 additions and 26 deletions
|
@ -1,23 +0,0 @@
|
|||
From 0699a9e10e95f8f42a46728f02ac195d688515cd Mon Sep 17 00:00:00 2001
|
||||
From: Aikar <aikar@aikar.co>
|
||||
Date: Tue, 20 Jun 2017 18:58:35 -0400
|
||||
Subject: [PATCH] Allow plugins to override Vanilla commands with aliases
|
||||
|
||||
Spigot broke this in 1.12, re-adding the logic back
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
index 6f733fe0..ac3d5035 100644
|
||||
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
|
||||
@@ -99,7 +99,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 (("minecraft".equals(fallbackPrefix) || isAlias) && knownCommands.containsKey(label)) { // Paper - allow plugins to override vanilla commands as aliases
|
||||
// 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
|
||||
--
|
||||
2.13.0
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit 052c8e5eb578f9c62414f9002f8816e82a198cda
|
||||
Subproject commit 6751b88aad40d75795e4111e894d815381688730
|
|
@ -1 +1 @@
|
|||
Subproject commit 03f1e37ae2f81b4a34006266e4a01f98aeaf5aff
|
||||
Subproject commit f3356f107465e2b74d353dce8f6daa49231dcc15
|
|
@ -1 +1 @@
|
|||
Subproject commit 4df3c0ca36fc1f84d4cb26b944357bfa0ee7e68a
|
||||
Subproject commit b78586d1d4719989f4b8ca6b4d456005c5984942
|
Loading…
Reference in a new issue