Update B/CB/S

Spigot-API-Patches/0040-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From f7bf3b52cb8544319a06bd35ffd803c7e488a6c2 Mon Sep 17 00:00:00 2001
+From 65b664ebccc15a537ec64b3a777ba6481259dde4 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 4a725d79..498dfd33 100644
+index fd423664..5431b17b 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -1197,6 +1197,15 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 4a725d79..498dfd33 100644
  
      public static Server.Spigot spigot()
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 3c550d06..4f077b7c 100644
+index 032d6211..83b370e5 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1030,4 +1030,6 @@ public interface Server extends PluginMessageRecipient {
@@ -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 f1e9f200..c6613c0a 100644
+index 762eb1d2..23d08336 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-@@ -280,4 +280,10 @@ public class SimpleCommandMap implements CommandMap {
+@@ -281,4 +281,10 @@ public class SimpleCommandMap implements CommandMap {
              }
          }
      }
@@ -97,5 +97,5 @@ index 040509c1..0069bcc0 100644
                  confirmed = true;
              } else {
 -- 
-2.13.2
+2.14.3