From 1e98b07ed5740e956bcb78db7279f1ff6c4ac82c Mon Sep 17 00:00:00 2001 From: Ananya Sharma <254700516+clawdbot-silly-waddle@users.noreply.github.com> Date: Sat, 7 Mar 2026 05:26:49 +0100 Subject: [PATCH] Fix magnet filter only checking first configured slot (#410) Co-authored-by: clawdbot-silly-waddle Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../item/WirelessMagnetCardFilterInventory.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java index f650e62a..d04e20ee 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -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;