From 446920485afebd59a790bbff65dc19791ad2a06d Mon Sep 17 00:00:00 2001 From: lc-1337 <62835225+lc-1337@users.noreply.github.com> Date: Sun, 7 Sep 2025 13:35:10 +0300 Subject: [PATCH] fix item duplication when cant inject (#334) Co-authored-by: UltraProdigy <187078471+UltraProdigy@users.noreply.github.com> --- .../item/WirelessMagnetCardFilterInventory.java | 17 ++++------------- .../com/glodblock/github/proxy/CommonProxy.java | 5 +---- 2 files changed, 5 insertions(+), 17 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 d8ab3f5c..b86c0a63 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java @@ -13,7 +13,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import com.glodblock.github.inventory.ItemBiggerAppEngInventory; @@ -210,19 +209,11 @@ public class WirelessMagnetCardFilterInventory extends BaseWirelessInventory imp return null; } - public boolean doInject(IAEItemStack is, EntityItem itemToGet, World world) { + public boolean doInject(IAEItemStack is, EntityItem itemToGet) { IAEItemStack ais = (IAEItemStack) injectItems(is); - if (ais != null) { - player.onItemPickup(itemToGet, ais.getItemStack().stackSize); - player.inventory.addItemStackToInventory(ais.getItemStack()); - world.playSoundAtEntity( - player, - "random.pop", - 0.15F, - ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); - return false; - } - return true; + if (ais == null) return true; + itemToGet.getEntityItem().stackSize = (int) ais.getStackSize(); + return false; } public boolean isItemFiltered(ItemStack inputItemStack) { diff --git a/src/main/java/com/glodblock/github/proxy/CommonProxy.java b/src/main/java/com/glodblock/github/proxy/CommonProxy.java index 52bdd547..2e859460 100644 --- a/src/main/java/com/glodblock/github/proxy/CommonProxy.java +++ b/src/main/java/com/glodblock/github/proxy/CommonProxy.java @@ -70,10 +70,7 @@ public class CommonProxy { .getFilter(wirelessTerm, result.getLeft(), gridNode, player); if (inv.isPassFilter(stack)) { - if (inv.doInject( - AEApi.instance().storage().createItemStack(stack), - itemEntity, - world)) { + if (inv.doInject(AEApi.instance().storage().createItemStack(stack), itemEntity)) { itemEntity.setDead(); e.setCanceled(true); }