diff options
Diffstat (limited to 'patches/api/0056-Fix-upstream-javadocs.patch')
| -rw-r--r-- | patches/api/0056-Fix-upstream-javadocs.patch | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/patches/api/0056-Fix-upstream-javadocs.patch b/patches/api/0056-Fix-upstream-javadocs.patch index e5282b07ab..f221402975 100644 --- a/patches/api/0056-Fix-upstream-javadocs.patch +++ b/patches/api/0056-Fix-upstream-javadocs.patch @@ -142,10 +142,10 @@ index e3136651ce083e67a1a7cb976d27df5666843401..50e8c25cc378b02b09ef57643cc753fa * @return an array containing all previous players */ diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java -index fa6f6c8eccd680a4e83443e472f37650e7cd05c5..6decacdf85827305dbee9d34dadef4bc7c69e20a 100644 +index 2b38b328187b853f5b36d796d3b6b359497647d8..a55e92dc09202437abac9cb5b7aacf3c275f5b9c 100644 --- a/src/main/java/org/bukkit/World.java +++ b/src/main/java/org/bukkit/World.java -@@ -2714,7 +2714,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -2723,7 +2723,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient /** * Find the closest nearby structure of a given {@link StructureType}. * Finding unexplored structures can, and will, block if the world is @@ -154,7 +154,7 @@ index fa6f6c8eccd680a4e83443e472f37650e7cd05c5..6decacdf85827305dbee9d34dadef4bc * temporarily freezing while locating an unexplored structure. * <p> * The {@code radius} is not a rigid square radius. Each structure may alter -@@ -2748,7 +2748,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -2757,7 +2757,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient /** * Find the closest nearby structure of a given {@link StructureType}. * Finding unexplored structures can, and will, block if the world is @@ -163,7 +163,7 @@ index fa6f6c8eccd680a4e83443e472f37650e7cd05c5..6decacdf85827305dbee9d34dadef4bc * temporarily freezing while locating an unexplored structure. * <p> * The {@code radius} is not a rigid square radius. Each structure may alter -@@ -2781,7 +2781,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient +@@ -2790,7 +2790,7 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient /** * Find the closest nearby structure of a given {@link Structure}. Finding * unexplored structures can, and will, block if the world is looking in @@ -369,7 +369,7 @@ index 1e56aef9188487d3e9c737e85025f601ab359a72..92cd35c87bad578c2b714761c93a5b72 */ LAND_ON_PORTAL, diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java -index 09936f3a2376a46721bbc8365c989581c2a789ef..3845a726adbd0e75d7bf2aeeb6da8cb571d51a8f 100644 +index fffc478312566bc5c36dbacbdd86341d84d50054..8d97cf229ce1d14232d0342121b5db2230795a1d 100644 --- a/src/main/java/org/bukkit/entity/HumanEntity.java +++ b/src/main/java/org/bukkit/entity/HumanEntity.java @@ -22,6 +22,11 @@ import org.jetbrains.annotations.Nullable; @@ -976,7 +976,7 @@ index 0cc6e29a5af28e95f87f415d6b2424d4622a6f34..c0b749a5bbf4980d01fed74768bb6190 * @param z the z location in the chunk from 0-15 inclusive * @return Biome value diff --git a/src/main/java/org/bukkit/inventory/EntityEquipment.java b/src/main/java/org/bukkit/inventory/EntityEquipment.java -index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf22b50ab7e 100644 +index 9adc827bc52eaa767a39c82e9cb0ff5a48e02b14..2dde946443fee1f6e79b882cbcb448549dc0c99c 100644 --- a/src/main/java/org/bukkit/inventory/EntityEquipment.java +++ b/src/main/java/org/bukkit/inventory/EntityEquipment.java @@ -37,9 +37,23 @@ public interface EntityEquipment { @@ -1160,13 +1160,10 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 ItemStack getBoots(); /** -@@ -202,12 +296,25 @@ public interface EntityEquipment { - void setBoots(@Nullable ItemStack boots, boolean silent); - +@@ -204,12 +298,25 @@ public interface EntityEquipment { /** -- * Gets a copy of all worn armor -+ * Gets all worn armor -+ * + * Gets all ItemStacks from the armor slots. + * + * <p> + * This returns a copy if this equipment instance is from a non-player, + * or it's an empty stack (has AIR as its type). @@ -1180,8 +1177,10 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 + * equipment.getArmorContents(); // will return an array of copies + * } + * }</pre> - * - * @return The array of worn armor. Individual items may be null. ++ * + * @return all the ItemStacks from the armor slots. Individual items can be + * null and are returned in a fixed order starting from the boots and going + * up to the helmet */ - @NotNull - ItemStack[] getArmorContents(); @@ -1189,7 +1188,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 /** * Sets the entities armor to the provided array of ItemStacks -@@ -247,7 +354,8 @@ public interface EntityEquipment { +@@ -249,7 +356,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1199,7 +1198,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return chance of the currently held item being dropped (1 for non-{@link Mob}) -@@ -260,7 +368,8 @@ public interface EntityEquipment { +@@ -262,7 +370,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1209,7 +1208,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @param chance the chance of the main hand item being dropped -@@ -274,7 +383,8 @@ public interface EntityEquipment { +@@ -276,7 +385,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1219,7 +1218,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return chance of the off hand item being dropped (1 for non-{@link Mob}) -@@ -287,7 +397,8 @@ public interface EntityEquipment { +@@ -289,7 +399,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1229,7 +1228,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @param chance the chance of off hand item being dropped -@@ -300,7 +411,8 @@ public interface EntityEquipment { +@@ -302,7 +413,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1239,7 +1238,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return the chance of the helmet being dropped (1 for non-{@link Mob}) -@@ -312,7 +424,8 @@ public interface EntityEquipment { +@@ -314,7 +426,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1249,7 +1248,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @param chance of the helmet being dropped -@@ -326,7 +439,8 @@ public interface EntityEquipment { +@@ -328,7 +441,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1259,7 +1258,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return the chance of the chest plate being dropped (1 for non-{@link Mob}) -@@ -339,7 +453,8 @@ public interface EntityEquipment { +@@ -341,7 +455,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1269,7 +1268,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @param chance of the chest plate being dropped -@@ -353,7 +468,8 @@ public interface EntityEquipment { +@@ -355,7 +470,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1279,7 +1278,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return the chance of the leggings being dropped (1 for non-{@link Mob}) -@@ -366,7 +482,8 @@ public interface EntityEquipment { +@@ -368,7 +484,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1289,7 +1288,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @param chance chance of the leggings being dropped -@@ -379,7 +496,8 @@ public interface EntityEquipment { +@@ -381,7 +498,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1299,7 +1298,7 @@ index d5b50a4a954fed35d37f03f1a277cc173ca106df..16bca8e40ff029cca94bbfd435db1cf2 * </ul> * * @return the chance of the boots being dropped (1 for non-{@link Mob}) -@@ -391,7 +509,8 @@ public interface EntityEquipment { +@@ -393,7 +511,8 @@ public interface EntityEquipment { * * <ul> * <li>A drop chance of 0.0F will never drop @@ -1323,10 +1322,10 @@ index 42fcc31147934fd4ed6484b0729e938e7ae2f8e2..4e637420b9a39b822be19367a16da93f HIDE_ARMOR_TRIM; } diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java -index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5fe1e3825 100644 +index f1918027c3a8735b31566856218611656b56db20..476fe14faa39f02444cab8ad95d4401033dc6938 100644 --- a/src/main/java/org/bukkit/inventory/PlayerInventory.java +++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java -@@ -158,7 +158,7 @@ public interface PlayerInventory extends Inventory { +@@ -160,7 +160,7 @@ public interface PlayerInventory extends Inventory { public void setBoots(@Nullable ItemStack boots); /** @@ -1335,7 +1334,7 @@ index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5 * in their main hand. * * @return the currently held item -@@ -174,7 +174,7 @@ public interface PlayerInventory extends Inventory { +@@ -176,7 +176,7 @@ public interface PlayerInventory extends Inventory { void setItemInMainHand(@Nullable ItemStack item); /** @@ -1344,7 +1343,7 @@ index 62fbd7f6d8195bebcab7f704a0a485a1bbeca26c..5461f7fa75f5a065bb333b4a113640b5 * in their off hand. * * @return the currently held item -@@ -190,7 +190,7 @@ public interface PlayerInventory extends Inventory { +@@ -192,7 +192,7 @@ public interface PlayerInventory extends Inventory { void setItemInOffHand(@Nullable ItemStack item); /** |