Update upstream B/CB/S

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

@@ -70,13 +70,16 @@ index 6b404e385..3d114cfea 100644
  
                  if (d3 < 0.0D || d4 < d3 * d3) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 06f33f80e..6f042b620 100644
+index d10177669..4f80d0443 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -0,0 +0,0 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         return new CraftAdvancementProgress(craft, data, progress);
-     }
- 
+     @Override
+     public String getLocale() {
+         return getHandle().locale;
++
++    }
++
 +    public void setAffectsSpawning(boolean affects) {
 +        this.getHandle().affectsSpawning = affects;
 +    }
@@ -84,9 +87,7 @@ index 06f33f80e..6f042b620 100644
 +    @Override
 +    public boolean getAffectsSpawning() {
 +        return this.getHandle().affectsSpawning;
-+    }
-+
+     }
+ 
      // Spigot start
-     private final Player.Spigot spigot = new Player.Spigot()
-     {
 --