Update upstream B/CB/S

This commit is contained in:
Zach Brown 2018-10-28 18:08:08 -04:00
parent e6473fc520
commit ece0b19c59
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
8 changed files with 140 additions and 123 deletions

View file

@ -1,4 +1,4 @@
From 65859f81051e06ab15abb717fdcec0cf9a4b954f Mon Sep 17 00:00:00 2001
From 2e4bd921ec9d8b9da7b6bdd24ff257a3f7859f8b Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Mon, 28 Nov 2016 10:16:39 -0500
Subject: [PATCH] Allow Reloading of Command Aliases
@ -55,10 +55,10 @@ index 30d60247..938959aa 100644
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
index 4aea03c6..63d27392 100644
index 75dfa95e..afc0774b 100644
--- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
+++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
@@ -282,4 +282,10 @@ public class SimpleCommandMap implements CommandMap {
@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
}
}
}
@ -97,5 +97,5 @@ index f331a442..a977045d 100644
confirmed = true;
} else {
--
2.19.0
2.19.1