mirror of
https://github.com/PaperMC/Paper.git
synced 2025-07-25 17:22:02 -07:00
Update upstream B/CB/S
--- work/Bukkit Submodule work/Bukkit 1627782b..67e91ef7: > Fix some incorrectly handled JavaDoc > SPIGOT-4478: Update PlayerLoginEvent docs > Add API to manipulate boss bar of entities and those created by commands --- work/CraftBukkit Submodule work/CraftBukkit ca22de36..3a911828: > SPIGOT-4477: Arrows only firing direction of boat > SPIGOT-4478: NPE during PlayerLoginEvent recipe manipulation > Add API to manipulate boss bar of entities and those created by commands --- work/Spigot Submodule work/Spigot 2474d93d..947a8e7f: > Rebuild patches
This commit is contained in:
@@ -6,7 +6,7 @@ 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/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java
|
||||
index 43239f844..fe8d34685 100644
|
||||
index 43239f84..fe8d3468 100644
|
||||
--- a/src/main/java/org/bukkit/NamespacedKey.java
|
||||
+++ b/src/main/java/org/bukkit/NamespacedKey.java
|
||||
@@ -0,0 +0,0 @@ public final class NamespacedKey {
|
||||
@@ -21,7 +21,7 @@ index 43239f844..fe8d34685 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
|
||||
index 06bcee03b..849ad2cbb 100644
|
||||
index 06bcee03..849ad2cb 100644
|
||||
--- a/src/main/java/org/bukkit/World.java
|
||||
+++ b/src/main/java/org/bukkit/World.java
|
||||
@@ -0,0 +0,0 @@ public interface World extends PluginMessageRecipient, Metadatable {
|
||||
@@ -89,7 +89,7 @@ index 06bcee03b..849ad2cbb 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, boolean force);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
index 107574546..6d5410eab 100644
|
||||
index 10757454..6d5410ea 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AbstractHorse.java
|
||||
@@ -0,0 +0,0 @@ public interface AbstractHorse extends Animals, Vehicle, InventoryHolder, Tameab
|
||||
@@ -102,7 +102,7 @@ index 107574546..6d5410eab 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
index 9a569d3a3..8c5efd17e 100644
|
||||
index 9a569d3a..8c5efd17 100644
|
||||
--- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
+++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
|
||||
@@ -0,0 +0,0 @@ public interface AreaEffectCloud extends Entity {
|
||||
@@ -114,7 +114,7 @@ index 9a569d3a3..8c5efd17e 100644
|
||||
<T> void setParticle(Particle particle, T data);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
|
||||
index 98af0563c..ec6890ae6 100644
|
||||
index 98af0563..ec6890ae 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Guardian.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Guardian.java
|
||||
@@ -0,0 +0,0 @@ public interface Guardian extends Monster {
|
||||
@@ -127,7 +127,7 @@ index 98af0563c..ec6890ae6 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Horse.java b/src/main/java/org/bukkit/entity/Horse.java
|
||||
index cfce8fa57..8660070bb 100644
|
||||
index cfce8fa5..8660070b 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Horse.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Horse.java
|
||||
@@ -0,0 +0,0 @@ public interface Horse extends AbstractHorse {
|
||||
@@ -140,7 +140,7 @@ index cfce8fa57..8660070bb 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
|
||||
index 4b0caae51..45690a2fa 100644
|
||||
index 4b0caae5..45690a2f 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, OfflinePlayer, PluginM
|
||||
@@ -233,7 +233,7 @@ index 4b0caae51..45690a2fa 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);
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
index 2a02ab855..e33d00b30 100644
|
||||
index 2a02ab85..e33d00b3 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Skeleton.java
|
||||
@@ -0,0 +0,0 @@ public interface Skeleton extends Monster {
|
||||
@@ -245,7 +245,7 @@ index 2a02ab855..e33d00b30 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/entity/Zombie.java b/src/main/java/org/bukkit/entity/Zombie.java
|
||||
index cf53ea22f..629233796 100644
|
||||
index cf53ea22..62923379 100644
|
||||
--- a/src/main/java/org/bukkit/entity/Zombie.java
|
||||
+++ b/src/main/java/org/bukkit/entity/Zombie.java
|
||||
@@ -0,0 +0,0 @@ public interface Zombie extends Monster {
|
||||
@@ -266,7 +266,7 @@ index cf53ea22f..629233796 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
index de4fb37f3..f1de2af6e 100644
|
||||
index 6532c24f..ee0b1273 100644
|
||||
--- a/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
+++ b/src/main/java/org/bukkit/event/player/PlayerLoginEvent.java
|
||||
@@ -0,0 +0,0 @@ public class PlayerLoginEvent extends PlayerEvent {
|
||||
@@ -286,7 +286,7 @@ index de4fb37f3..f1de2af6e 100644
|
||||
public PlayerLoginEvent(final Player player, String hostname, final InetAddress address, final Result result, final String message, final InetAddress realAddress) { // Spigot
|
||||
this(player, hostname, address, realAddress); // Spigot
|
||||
diff --git a/src/main/java/org/bukkit/inventory/ItemFactory.java b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
index 762c43d69..ec2b8b8ed 100644
|
||||
index 762c43d6..ec2b8b8e 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/ItemFactory.java
|
||||
@@ -0,0 +0,0 @@ public interface ItemFactory {
|
||||
@@ -304,7 +304,7 @@ index 762c43d69..ec2b8b8ed 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/inventory/Merchant.java b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
index c8e68570f..45431b360 100644
|
||||
index c8e68570..45431b36 100644
|
||||
--- a/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
+++ b/src/main/java/org/bukkit/inventory/Merchant.java
|
||||
@@ -0,0 +0,0 @@ public interface Merchant {
|
||||
@@ -326,7 +326,7 @@ index c8e68570f..45431b360 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 1413b361b..b4a8051cc 100644
|
||||
index 1413b361..b4a8051c 100644
|
||||
--- a/src/main/java/org/bukkit/potion/Potion.java
|
||||
+++ b/src/main/java/org/bukkit/potion/Potion.java
|
||||
@@ -0,0 +0,0 @@ public class Potion {
|
||||
@@ -338,7 +338,7 @@ index 1413b361b..b4a8051cc 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/potion/PotionBrewer.java b/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
index 40f8d12b9..33d192287 100644
|
||||
index 40f8d12b..33d19228 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionBrewer.java
|
||||
@@ -0,0 +0,0 @@ public interface PotionBrewer {
|
||||
@@ -351,7 +351,7 @@ index 40f8d12b9..33d192287 100644
|
||||
*/
|
||||
public Collection<PotionEffect> getEffects(PotionType type, boolean upgraded, boolean extended);
|
||||
diff --git a/src/main/java/org/bukkit/potion/PotionType.java b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
index 034421a76..f1a54c23c 100644
|
||||
index 034421a7..f1a54c23 100644
|
||||
--- a/src/main/java/org/bukkit/potion/PotionType.java
|
||||
+++ b/src/main/java/org/bukkit/potion/PotionType.java
|
||||
@@ -0,0 +0,0 @@ public enum PotionType {
|
||||
@@ -381,7 +381,7 @@ index 034421a76..f1a54c23c 100644
|
||||
*/
|
||||
@Deprecated
|
||||
diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
|
||||
index ab71f3c31..358ea386b 100644
|
||||
index ab71f3c3..358ea386 100644
|
||||
--- a/src/main/java/org/bukkit/scoreboard/Team.java
|
||||
+++ b/src/main/java/org/bukkit/scoreboard/Team.java
|
||||
@@ -0,0 +0,0 @@ public interface Team {
|
||||
|
Reference in New Issue
Block a user