core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update CB/S

This commit is contained in:
Shane Freeder 2017-09-09 08:17:12 +01:00
parent a0cd14a34c
commit 2104c3a683
No known key found for this signature in database
GPG Key ID: A3F61EA5A085289C
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
View File

@ -1,4 +1,4 @@
From ae76f2d87e3022fd57fde5fd771639aff7bb2728 Mon Sep 17 00:00:00 2001 From 3a264c354815e0a8cd58ef749c5d8311a9b71429 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com> From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500 Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -112,7 +112,7 @@ index cfce8fa5..8660070b 100644
*/ */
@Deprecated @Deprecated
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java 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 --- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java +++ b/src/main/java/org/bukkit/entity/Player.java
@@ -410,7 +410,7 @@ public interface Player extends HumanEntity, Conversable, CommandSender, Offline @@ -410,7 +410,7 @@ 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); public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1719,7 +1729,7 @@ 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 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
index 2a02ab85..e33d00b3 100644 index 2a02ab85..e33d00b3 100644
--- a/src/main/java/org/bukkit/entity/Skeleton.java --- a/src/main/java/org/bukkit/entity/Skeleton.java
@ -357,5 +348,5 @@ index 170ae21a..c0de37a7 100644
ChatColor getColor() throws IllegalStateException; ChatColor getColor() throws IllegalStateException;
-- --
2.13.0.windows.1 2.14.1

2
work/CraftBukkit

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

2
work/Spigot

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