Fixed ammunition press using null instead of ItemStack#EMPTY

Cubed-Development · Nov 25, 2024 · 11aa279 · 11aa279
1 parent fa4c34a
commit 11aa279
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -18,6 +18,7 @@ and this project follows the [Ragnarök Versioning Convention](https://github.co
 ### Fixed
 
 - Fixed accidental use of `akka.japi.Predicate` instead `java.util.function.Predicate`
+- Fixed ammunition press using `null` instead of `ItemStack#EMPTY`
 
 ## Modern Warfare Cubed Version 0.1.8 Changelog - 2024-08-16
 

diff --git a/src/main/java/com/paneedah/weaponlib/crafting/ammopress/TileEntityAmmoPress.java b/src/main/java/com/paneedah/weaponlib/crafting/ammopress/TileEntityAmmoPress.java
@@ -56,7 +56,8 @@ public int getDismantlingTime(IModernCraftingRecipe crafting) {
 
 
 	public ItemStack getLatestStackInQueue() {
-		if(this.craftStack.isEmpty()) return null;
+		if(this.craftStack.isEmpty())
+			return ItemStack.EMPTY;
 		ItemStack stack = craftStack.peek();
 		if(stack.isEmpty()) {
 			craftStack.pop();
@@ -94,7 +95,7 @@ public void readBytesFromClientSync(ByteBuf buf) {
 	}
 
 	public boolean hasStack() {
-		return !this.craftStack.isEmpty() && getLatestStackInQueue() != null;
+		return !this.craftStack.isEmpty() && getLatestStackInQueue() != ItemStack.EMPTY;
 	}
 
 	public void addStack(ItemStack stack) {