mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-24 19:56:25 +00:00
52a05907c7
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 97c59261 PR-1073: Make Biome an interface a38581aa Fix further javadoc errors 8271c490 Fix javadoc error 8a9ecf29 PR-1072: Fix bad naming for Vault State methods 6dd58108 PR-1071: Make Fluid an interface and add missing entry ed2cdfc3 PR-1070: Make Attribute an interface and align names with the new minecraft ones 63472efb PR-1069: Add missing winter drop experimental annotation to pale boats CraftBukkit Changes: 7235ad7b0 PR-1501: Make Biome an interface 602904003 PR-1500: Rename implementation for Vault State methods 75f26f79f PR-1499: Make Fluid an interface and add missing entry 4cfd87adc PR-1498: Make Attribute an interface and align names with the new minecraft ones 6bb0db5cb SPIGOT-7928: ExactChoice acts as MaterialChoice 3eaf3a13c SPIGOT-7929: Error when setting EquippableComponent abbf57bac SPIGOT-7930: Fix spawning entities with SummonEntityEffect 92d6ab6cf PR-1497: Move boat field rename entries to below key renaming, so that keys are also renamed abfe292aa PR-1496: Use correct Fluid class on Tags type check c7aab7fa7 SPIGOT-7923: Fix Dispenser logic to avoid firing empty projectiles
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
|
|
Date: Thu, 29 Feb 2024 17:54:26 -0500
|
|
Subject: [PATCH] Deprecate ItemStack#setType
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index 49390979cc0c68b8e719f2a2ce9e7d193c747959..82a66820311cfd918ea322f57df97e3a56e79c1d 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -143,8 +143,18 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
* {@link Material#isItem()} returns false.</b>
|
|
*
|
|
* @param type New type to set the items in this stack to
|
|
+ * @deprecated <b>Setting the material type of ItemStacks is no longer supported.</b>
|
|
+ * <p>
|
|
+ * This method is deprecated due to potential illegal behavior that may occur
|
|
+ * during the context of which this ItemStack is being used, allowing for certain item validation to be bypassed.
|
|
+ * It is recommended to instead create a new ItemStack object with the desired
|
|
+ * Material type, and if possible, set it in the appropriate context.
|
|
+ *
|
|
+ * Using this method in ItemStacks passed in events will result in undefined behavior.
|
|
+ * @see ItemStack#withType(Material)
|
|
*/
|
|
@Utility
|
|
+ @Deprecated // Paper
|
|
public void setType(@NotNull Material type) {
|
|
Preconditions.checkArgument(type != null, "Material cannot be null");
|
|
this.type = type;
|
|
@@ -157,6 +167,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
this.data = null;
|
|
}
|
|
}
|
|
+ // Paper start
|
|
+ /**
|
|
+ * Creates a new ItemStack with the specified Material type, where the item count and item meta is preserved.
|
|
+ *
|
|
+ * @param type The Material type of the new ItemStack.
|
|
+ * @return A new ItemStack instance with the specified Material type.
|
|
+ */
|
|
+ @NotNull
|
|
+ @org.jetbrains.annotations.Contract(value = "_ -> new", pure = true)
|
|
+ public ItemStack withType(@NotNull Material type) {
|
|
+ ItemStack itemStack = new ItemStack(type, this.amount);
|
|
+ if (this.hasItemMeta()) {
|
|
+ itemStack.setItemMeta(this.getItemMeta());
|
|
+ }
|
|
+
|
|
+ return itemStack;
|
|
+ }
|
|
+ // Paper end
|
|
|
|
/**
|
|
* Gets the amount of items in this stack
|