1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-03 21:37:28 +01:00

Update CB/S

This commit is contained in:
Shane Freeder 2017-09-09 08:17:12 +01:00
parent 4424c3dec9
commit 89e69d652f
3 changed files with 3 additions and 12 deletions

View file

@ -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

@ -1 +1 @@
Subproject commit 9e3636d82a294ae9eaa1ba355765e1e471c66a6c
Subproject commit 876d22cd55a8e7ec8c851725291adb7c87ef6dc2

@ -1 +1 @@
Subproject commit 65e8124d1adfa77a02ecd619be8ee28f3e89cafd
Subproject commit da4297479a847aaf2efa60ff147a44345c6bd737