Merge branch 'NCBPFluffyBear:master' into master

Prince527GitHub · web-flow · commit ecaf9f67a6f6 · 2026-01-07T07:10:02.000-04:00
diff --git a/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java b/src/main/java/io/ncbpfluffybear/fluffymachines/items/Barrel.java
@@ -512,7 +512,7 @@ private boolean matchMeta(ItemStack item1, ItemStack item2) {
             return false;
         }
 
-        if (!item1.hasItemMeta() || !item2.hasItemMeta()) {
+        if (!item1.hasItemMeta() && !item2.hasItemMeta()) {
             return true; // Match by type
         }
 

Original file line number	Diff line number	Diff line change
`@@ -512,7 +512,7 @@ private boolean matchMeta(ItemStack item1, ItemStack item2) {`
`512`	`512`	`return false;`
`513`	`513`	`}`
`514`	`514`
`515`		`- if (!item1.hasItemMeta() \|\| !item2.hasItemMeta()) {`
	`515`	`+ if (!item1.hasItemMeta() && !item2.hasItemMeta()) {`
`516`	`516`	`return true; // Match by type`
`517`	`517`	`}`
`518`	`518`