mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update B/CB/S

Browse source
This commit is contained in:
Shane Freeder 2017-11-18 03:04:21 +00:00
parent caec68907d
commit 7f12781017
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
23 changed files with 108 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Spigot-API-Patches/0052-Fix-upstream-javadoc-warnings-and-errors.patch
View file

@ -1,4 +1,4 @@
From 3a264c354815e0a8cd58ef749c5d8311a9b71429 Mon Sep 17 00:00:00 2001
From c951f10585428331ded76330d1363aef859b66b5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sat, 10 Jun 2017 16:59:40 -0500
Subject: [PATCH] Fix upstream javadoc warnings and errors
@ -21,10 +21,10 @@ index 9597a9d8..478f2c3c 100644
*/
@Deprecated
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 4abdbadf..dd0dcb16 100644
index 68388416..c69619da 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1395,6 +1395,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1405,6 +1405,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -32,7 +32,7 @@ index 4abdbadf..dd0dcb16 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, T data);
@@ -1410,6 +1411,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1420,6 +1421,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param count the number of particles
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -40,7 +40,7 @@ index 4abdbadf..dd0dcb16 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, T data);
@@ -1459,6 +1461,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1469,6 +1471,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -48,7 +48,7 @@ index 4abdbadf..dd0dcb16 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1478,6 +1481,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1488,6 +1491,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* @param offsetZ the maximum random offset on the Z axis
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -56,7 +56,7 @@ index 4abdbadf..dd0dcb16 100644
*/
public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, T data);
@@ -1533,6 +1537,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1543,6 +1547,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -64,7 +64,7 @@ index 4abdbadf..dd0dcb16 100644
*/
public <T> void spawnParticle(Particle particle, Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, T data);
@@ -1554,6 +1559,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -1564,6 +1569,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
* particle used (normally speed)
* @param data the data to use for the particle or null,
* the type of this depends on {@link Particle#getDataType()}
@ -280,7 +280,7 @@ index c8e68570..45431b36 100644
void setRecipe(int i, MerchantRecipe recipe) throws IndexOutOfBoundsException;
diff --git a/src/main/java/org/bukkit/potion/Potion.java b/src/main/java/org/bukkit/potion/Potion.java
index 7aa5a2d1..54d85d0c 100644
index 1413b361..b4a8051c 100644
--- a/src/main/java/org/bukkit/potion/Potion.java
+++ b/src/main/java/org/bukkit/potion/Potion.java
@@ -78,6 +78,7 @@ public class Potion {
@ -348,5 +348,5 @@ index 170ae21a..c0de37a7 100644
ChatColor getColor() throws IllegalStateException;
--
2.14.1
2.15.0