Skip to content

Commit 4469204

Browse files
fix item duplication when cant inject (#334)
Co-authored-by: UltraProdigy <[email protected]>
1 parent a48914c commit 4469204

File tree

2 files changed

+5
-17
lines changed

2 files changed

+5
-17
lines changed

src/main/java/com/glodblock/github/inventory/item/WirelessMagnetCardFilterInventory.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import net.minecraft.inventory.IInventory;
1414
import net.minecraft.item.ItemStack;
1515
import net.minecraft.nbt.NBTTagCompound;
16-
import net.minecraft.world.World;
1716

1817
import com.glodblock.github.inventory.ItemBiggerAppEngInventory;
1918

@@ -210,19 +209,11 @@ public IInventory getInventoryByName(String name) {
210209
return null;
211210
}
212211

213-
public boolean doInject(IAEItemStack is, EntityItem itemToGet, World world) {
212+
public boolean doInject(IAEItemStack is, EntityItem itemToGet) {
214213
IAEItemStack ais = (IAEItemStack) injectItems(is);
215-
if (ais != null) {
216-
player.onItemPickup(itemToGet, ais.getItemStack().stackSize);
217-
player.inventory.addItemStackToInventory(ais.getItemStack());
218-
world.playSoundAtEntity(
219-
player,
220-
"random.pop",
221-
0.15F,
222-
((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F);
223-
return false;
224-
}
225-
return true;
214+
if (ais == null) return true;
215+
itemToGet.getEntityItem().stackSize = (int) ais.getStackSize();
216+
return false;
226217
}
227218

228219
public boolean isItemFiltered(ItemStack inputItemStack) {

src/main/java/com/glodblock/github/proxy/CommonProxy.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ public void pickupEvent(EntityItemPickupEvent e) {
7070
.getFilter(wirelessTerm, result.getLeft(), gridNode, player);
7171

7272
if (inv.isPassFilter(stack)) {
73-
if (inv.doInject(
74-
AEApi.instance().storage().createItemStack(stack),
75-
itemEntity,
76-
world)) {
73+
if (inv.doInject(AEApi.instance().storage().createItemStack(stack), itemEntity)) {
7774
itemEntity.setDead();
7875
e.setCanceled(true);
7976
}

0 commit comments

Comments
 (0)