From 89e69d652f9b02db2530b9dff2d563bc15a17fad Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sat, 9 Sep 2017 08:17:12 +0100 Subject: [PATCH] Update CB/S --- .../Fix-upstream-javadoc-warnings-and-errors.patch | 11 +---------- work/CraftBukkit | 2 +- work/Spigot | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch b/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch index 1e7f7288f5..7eecf793de 100644 --- a/Spigot-API-Patches/Fix-upstream-javadoc-warnings-and-errors.patch +++ b/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 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 diff --git a/work/CraftBukkit b/work/CraftBukkit index 9e3636d82a..876d22cd55 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 9e3636d82a294ae9eaa1ba355765e1e471c66a6c +Subproject commit 876d22cd55a8e7ec8c851725291adb7c87ef6dc2 diff --git a/work/Spigot b/work/Spigot index 65e8124d1a..da4297479a 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 65e8124d1adfa77a02ecd619be8ee28f3e89cafd +Subproject commit da4297479a847aaf2efa60ff147a44345c6bd737