Update upstream B/CB/S

Spigot-API-Patches/Player-affects-spawning-API.patch

@@ -5,12 +5,12 @@ Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 845c3670..95880585 100644
+index d2a78f56..e429e701 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
       */
-     public AdvancementProgress getAdvancementProgress(Advancement advancement);
+     public String getLocale();
  
 +    /**
 +     * Get whether the player can affect mob spawning