2019-06-08 22:33:05 +02:00
|
|
|
From b7fced171296a683ca63cb04104f501dc1a37d30 Mon Sep 17 00:00:00 2001
|
2017-06-11 00:11:10 +02:00
|
|
|
From: Zach Brown <zach.brown@destroystokyo.com>
|
|
|
|
Date: Sat, 10 Jun 2017 16:59:40 -0500
|
|
|
|
Subject: [PATCH] Fix upstream javadoc warnings and errors
|
|
|
|
|
|
|
|
Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
2019-06-08 22:33:05 +02:00
|
|
|
index d1d64fb6..2fe46faf 100644
|
2017-06-11 00:11:10 +02:00
|
|
|
--- a/src/main/java/org/bukkit/World.java
|
|
|
|
+++ b/src/main/java/org/bukkit/World.java
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1657,6 +1657,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1673,6 +1674,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1723,6 +1725,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1743,6 +1746,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1799,6 +1803,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* particle used (normally speed)
|
|
|
|
* @param data the data to use for the particle or null,
|
|
|
|
* the type of this depends on {@link Particle#getDataType()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1821,6 +1826,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2017-06-11 00:11:10 +02:00
|
|
|
* particle used (normally speed)
|
|
|
|
* @param data the data to use for the particle or null,
|
|
|
|
* the type of this depends on {@link Particle#getDataType()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1844,6 +1850,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2018-10-25 15:38:19 +02:00
|
|
|
* @param force whether to send the particle to players within an extended
|
|
|
|
* range and encourage their client to render it regardless of
|
|
|
|
* settings
|
|
|
|
+ * @param <T> Particle data type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
|
2018-10-25 15:38:19 +02:00
|
|
|
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -1869,6 +1876,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
2018-10-25 15:38:19 +02:00
|
|
|
* @param force whether to send the particle to players within an extended
|
|
|
|
* range and encourage their client to render it regardless of
|
|
|
|
* settings
|
|
|
|
+ * @param <T> Particle data type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
|
2018-10-25 15:38:19 +02:00
|
|
|
|
2018-08-17 06:29:16 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
2019-06-08 22:33:05 +02:00
|
|
|
index c2096b53..bca9d365 100644
|
2018-08-17 06:29:16 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
2019-05-22 06:14:56 +02:00
|
|
|
@@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
|
2018-08-17 06:29:16 +02:00
|
|
|
* @param particle the new particle type
|
|
|
|
* @param data the data to use for the particle or null,
|
|
|
|
* the type of this depends on {@link Particle#getDataType()}
|
|
|
|
+ * @param <T> the particle data type // Paper
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
<T> void setParticle(@NotNull Particle particle, @Nullable T data);
|
2018-08-17 06:29:16 +02:00
|
|
|
|
2017-06-11 00:11:10 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
2019-06-08 22:33:05 +02:00
|
|
|
index 62fe51ab..f14bdd22 100644
|
2017-06-11 00:11:10 +02:00
|
|
|
--- a/src/main/java/org/bukkit/entity/Player.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/Player.java
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -440,7 +440,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
*
|
|
|
|
* Use supplied alternative character to the section symbol to represent legacy color codes.
|
|
|
|
*
|
|
|
|
- * @param alternateChar Alternate symbol such as '&'
|
|
|
|
+ * @param alternateChar Alternate symbol such as '&'
|
|
|
|
* @param message The message to send
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public void sendActionBar(char alternateChar, @NotNull String message);
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -507,6 +507,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
/**
|
|
|
|
* Update the subtitle of titles displayed to the player
|
|
|
|
*
|
|
|
|
+ * @param subtitle Subtitle to set
|
|
|
|
* @deprecated Use {@link #updateTitle(Title)}
|
|
|
|
*/
|
|
|
|
@Deprecated
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -515,6 +516,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
/**
|
|
|
|
* Update the subtitle of titles displayed to the player
|
|
|
|
*
|
|
|
|
+ * @param subtitle Subtitle to set
|
|
|
|
* @deprecated Use {@link #updateTitle(Title)}
|
|
|
|
*/
|
|
|
|
@Deprecated
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -523,6 +525,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
/**
|
|
|
|
* Show the given title to the player, along with the last subtitle set, using the last set times
|
|
|
|
*
|
|
|
|
+ * @param title Title to set
|
|
|
|
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
|
|
|
|
*/
|
|
|
|
@Deprecated
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -531,6 +534,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
/**
|
|
|
|
* Show the given title to the player, along with the last subtitle set, using the last set times
|
|
|
|
*
|
|
|
|
+ * @param title Title to set
|
|
|
|
* @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
|
|
|
|
*/
|
|
|
|
@Deprecated
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1431,6 +1435,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1447,6 +1452,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1497,6 +1503,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1517,6 +1524,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* @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()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1573,6 +1581,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* particle used (normally speed)
|
|
|
|
* @param data the data to use for the particle or null,
|
|
|
|
* the type of this depends on {@link Particle#getDataType()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-06-08 22:33:05 +02:00
|
|
|
@@ -1595,6 +1604,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
2017-06-11 00:11:10 +02:00
|
|
|
* particle used (normally speed)
|
|
|
|
* @param data the data to use for the particle or null,
|
|
|
|
* the type of this depends on {@link Particle#getDataType()}
|
|
|
|
+ * @param <T> Type
|
|
|
|
*/
|
2019-03-20 01:28:15 +01:00
|
|
|
public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
|
2017-06-11 00:11:10 +02:00
|
|
|
|
2019-04-15 00:45:42 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
2019-06-08 22:33:05 +02:00
|
|
|
index 1b2267f4..1a58734d 100644
|
2019-04-15 00:45:42 +02:00
|
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
|
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
|
2019-05-06 04:58:04 +02:00
|
|
|
@@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
|
2019-04-15 00:45:42 +02:00
|
|
|
*
|
|
|
|
* @return Location the player moved to
|
|
|
|
*/
|
|
|
|
- @Nullable
|
|
|
|
+ @NotNull // Paper
|
|
|
|
public Location getTo() {
|
|
|
|
return to;
|
|
|
|
}
|
2017-06-11 00:11:10 +02:00
|
|
|
--
|
2019-03-20 01:28:15 +01:00
|
|
|
2.21.0
|
2017-06-11 00:11:10 +02:00
|
|
|
|