From e6d31d59ddf47af6b0dfc57f7e314120a34e17d8 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Wed, 21 Nov 2018 22:25:30 -0500 Subject: [PATCH] No generics in javadocs, what are you doin --- ...CanPlaceOn-and-CanDestroy-NBT-values.patch | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/Spigot-API-Patches/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch b/Spigot-API-Patches/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch index 20dcab3aae..ab7ad3b124 100644 --- a/Spigot-API-Patches/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch +++ b/Spigot-API-Patches/0151-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch @@ -1,4 +1,4 @@ -From 89e9f2e1093c104637f4bfd282c774b88b1bccc8 Mon Sep 17 00:00:00 2001 +From 790d964de5cce64ce961552f37ee17e35bf1477d Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:35 +0300 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values @@ -217,9 +217,34 @@ index fe8d3468..074769c1 100644 return key; } diff --git a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java -index 2278d470..13a153c8 100644 +index 2278d470..60ed443a 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +@@ -81,13 +81,13 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { + *

+ * Plugins should check if hasLore() returns true before + * calling this method. +- * ++ * + * @return a list of lore that is set + */ + List getLore(); + + /** +- * Sets the lore for this item. ++ * Sets the lore for this item. + * Removes lore when given null. + * + * @param lore the lore that will be set +@@ -118,7 +118,7 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { + int getEnchantLevel(Enchantment ench); + + /** +- * Returns a copy the enchantments in this ItemMeta.
++ * Returns a copy the enchantments in this ItemMeta.
+ * Returns an empty map if none. + * + * @return An immutable copy of the enchantments @@ -348,4 +348,83 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { Spigot spigot(); @@ -271,7 +296,7 @@ index 2278d470..13a153c8 100644 + /** + * Sets the collection of namespaced keys that the item can destroy in {@link org.bukkit.GameMode#ADVENTURE} + * -+ * @param canDestroy Set of {@link com.destroystokyo.paper.Namespaced} ++ * @param canDestroy Collection of {@link com.destroystokyo.paper.Namespaced} + */ + void setDestroyableKeys(Collection canDestroy); + @@ -285,7 +310,7 @@ index 2278d470..13a153c8 100644 + /** + * Sets the set of namespaced keys that the item can be placed on in {@link org.bukkit.GameMode#ADVENTURE} + * -+ * @param canPlaceOn Set of {@link Collection} ++ * @param canPlaceOn Collection of {@link com.destroystokyo.paper.Namespaced} + */ + void setPlaceableKeys(Collection canPlaceOn); +