Update upstream B/CB/S

Remove two features added upstream

Spigot-Server-Patches/0059-Expose-server-CommandMap.patch

@@ -0,0 +1,21 @@
+From c3907844a571935fcc6702d446cdb9a4f86c4354 Mon Sep 17 00:00:00 2001
+From: kashike <kashike@vq.lc>
+Date: Thu, 3 Mar 2016 02:15:57 -0600
+Subject: [PATCH] Expose server CommandMap
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+index 8e501b6..c7cd3f7 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+@@ -1564,6 +1564,7 @@ public final class CraftServer implements Server {
+         return helpMap;
+     }
+ 
++    @Override // Paper - add override
+     public SimpleCommandMap getCommandMap() {
+         return commandMap;
+     }
+-- 
+2.9.2.windows.1
+