twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-12 10:45:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

SPIGOT-5515: Add basic validation against creating non-item itemstacks

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2020-01-15 14:03:12 +11:00
parent b8b594d610
commit e5ce128c45
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
paper-api/src/main/java/org/bukkit/inventory/ItemStack.java
View File

@@ -68,6 +68,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@Deprecated @Deprecated
public ItemStack(@NotNull final Material type, final int amount, final short damage, @Nullable final Byte data) { public ItemStack(@NotNull final Material type, final int amount, final short damage, @Nullable final Byte data) {
Validate.notNull(type, "Material cannot be null"); Validate.notNull(type, "Material cannot be null");
Validate.isTrue(type.isItem(), "Material must be an item: ", type);
this.type = type; this.type = type;
this.amount = amount; this.amount = amount;
if (damage != 0) { if (damage != 0) {
@@ -116,6 +117,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {
@Utility @Utility
public void setType(@NotNull Material type) { public void setType(@NotNull Material type) {
Validate.notNull(type, "Material cannot be null"); Validate.notNull(type, "Material cannot be null");
Validate.isTrue(type.isItem(), "Material must be an item: ", type);
this.type = type; this.type = type;
if (this.meta != null) { if (this.meta != null) {
this.meta = Bukkit.getItemFactory().asMetaFor(meta, type); this.meta = Bukkit.getItemFactory().asMetaFor(meta, type);