geforkt von Mirrors/Paper
71c84c8132
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: 9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent 258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD CraftBukkit Changes: 98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent 5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class 76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor Spigot Changes: e9ec5485 Rebuild patches f1b62e0c Rebuild patches
37 Zeilen
1.5 KiB
Diff
37 Zeilen
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aeltumn <daniel@goossens.ch>
|
|
Date: Mon, 28 Aug 2023 13:41:09 +0200
|
|
Subject: [PATCH] Allow proper checking of empty item stacks
|
|
|
|
This adds a method to check if an item stack is empty or not. This mirrors vanilla's implementation of the same method.
|
|
|
|
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
index 845037909658884167136955a02b99af0040fa9c..c3872213acc75d913580002cf70c2abb4ec69ca0 100644
|
|
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
|
|
@@ -996,5 +996,24 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat
|
|
public @NotNull ItemStack damage(int amount, @NotNull org.bukkit.entity.LivingEntity livingEntity) {
|
|
return livingEntity.damageItemStack(this, amount);
|
|
}
|
|
+
|
|
+ /**
|
|
+ * Returns an empty item stack, consists of an air material and a stack size of 0.
|
|
+ *
|
|
+ * Any item stack with a material of air or a stack size of 0 is seen
|
|
+ * as being empty by {@link ItemStack#isEmpty}.
|
|
+ */
|
|
+ @NotNull
|
|
+ public static ItemStack empty() {
|
|
+ return new ItemStack();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns whether this item stack is empty and contains no item. This means
|
|
+ * it is either air or the stack has a size of 0.
|
|
+ */
|
|
+ public boolean isEmpty() {
|
|
+ return type.isAir() || amount <= 0;
|
|
+ }
|
|
// Paper end
|
|
}
|