Update CB/S

Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch

@@ -112,7 +112,7 @@ index cfce8fa5..8660070b 100644
       */
      @Deprecated
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 41ba6c11..0c3eb03f 100644
+index a80b4599..0c3eb03f 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
@@ -204,15 +204,6 @@ index 41ba6c11..0c3eb03f 100644
       */
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
  
-@@ -0,0 +0,0 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline
-          * Gets player locale language.
-          *
-          * @return the player's client language settings
--         * @deprecated Use {@link Player#getLocale()
-+         * @deprecated Use {@link Player#getLocale()}
-          */
-         @Deprecated
-         public String getLocale()
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
 index 2a02ab85..e33d00b3 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java