mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-11 15:57:55 +00:00
Fix magnet filter only checking first configured slot (#410)
Co-authored-by: clawdbot-silly-waddle <clawdbot-silly-waddle@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
1 file changed
+6
-8
+6
-8
@@ -231,21 +231,19 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp
|
||||
.sameOre(OreHelper.INSTANCE.isOre(is), OreHelper.INSTANCE.isOre(inputItemStack)))
|
||||
return true;
|
||||
}
|
||||
boolean match;
|
||||
if (ignoreMeta && ignoreNbt) {
|
||||
// ignore meta & nbt
|
||||
return is.getItem().equals(inputItemStack.getItem());
|
||||
match = is.getItem().equals(inputItemStack.getItem());
|
||||
} else if (ignoreMeta) {
|
||||
// ignore meta only
|
||||
return ItemStack.areItemStackTagsEqual(is, inputItemStack)
|
||||
match = ItemStack.areItemStackTagsEqual(is, inputItemStack)
|
||||
&& is.getItem() == inputItemStack.getItem();
|
||||
} else if (ignoreNbt) {
|
||||
// ignore nbt only
|
||||
return is.getItem() == inputItemStack.getItem()
|
||||
match = is.getItem() == inputItemStack.getItem()
|
||||
&& is.getItemDamage() == inputItemStack.getItemDamage();
|
||||
} else {
|
||||
// ignore nothing/don't use oredict--must be exact match
|
||||
return is.isItemEqual(inputItemStack) && ItemStack.areItemStackTagsEqual(is, inputItemStack);
|
||||
match = is.isItemEqual(inputItemStack) && ItemStack.areItemStackTagsEqual(is, inputItemStack);
|
||||
}
|
||||
if (match) return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
||||
Reference in new issue
Block a user