Update upstream B/CB

Closes GH-569

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

@@ -10,8 +10,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -0,0 +0,0 @@ public final class Bukkit {
-     public static Entity getEntity(UUID uuid) {
-         return server.getEntity(uuid);
+     public static void reloadPermissions() {
+         server.reloadPermissions();
      }
 +
 +    /**
@@ -28,9 +28,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -0,0 +0,0 @@ public interface Server extends PluginMessageRecipient {
-      * @return The entity that is identified by the given UUID, or null if one isn't found
-      */
-     Entity getEntity(UUID uuid); // Paper
+     Spigot spigot();
+ 
+     void reloadPermissions(); // Paper
 +
 +    void reloadCommandAliases(); // Paper
  }