upstream/Mekanism-Community-Edition
1
0 Fork 0
mirror of https://github.com/Thorfusion/Mekanism-Community-Edition.git synced 2026-11-08 19:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix #235 npe

Browse Source
This commit is contained in:
maggi373 committed 2026-02-24 21:50:52 +01:00
1 parent 76ae49ba94
commit 99b3d9f707
1 file changed
+20 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/mekanism/api/util/StackUtils.java
+20 -3
View File
@@ -50,7 +50,15 @@ public final class StackUtils
return false;
}
return stack1.getItem() != stack2.getItem() || stack1.getItemDamage() != stack2.getItemDamage();
Item item1 = stack1.getItem();
Item item2 = stack2.getItem();
if(item1 == null || item2 == null)
{
return item1 != item2;
}
return item1 != item2 || stack1.getItemDamage() != stack2.getItemDamage();
}
public static boolean equalsWildcard(ItemStack wild, ItemStack check)
@@ -59,8 +67,17 @@ public final class StackUtils
{
return check == wild;
}
return wild.getItem() == check.getItem() && (wild.getItemDamage() == OreDictionary.WILDCARD_VALUE || wild.getItemDamage() == check.getItemDamage());
Item wildItem = wild.getItem();
Item checkItem = check.getItem();
if(wildItem == null || checkItem == null)
{
return wildItem == checkItem;
}
int wildDamage = wild.getItemDamage();
return wildItem == checkItem && (wildDamage == OreDictionary.WILDCARD_VALUE || wildDamage == check.getItemDamage());
}
public static boolean equalsWildcardWithNBT(ItemStack wild, ItemStack check)