From dc30df522c0c9130fa515f523c386bfc6996ecea Mon Sep 17 00:00:00 2001 From: yueh Date: Thu, 16 Oct 2014 14:57:43 +0200 Subject: [PATCH] Fixes dupe bug. #309 --- .../appeng/util/inv/AdaptorPlayerHand.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java index 5206e08c45e..5ac7c1a0243 100644 --- a/src/main/java/appeng/util/inv/AdaptorPlayerHand.java +++ b/src/main/java/appeng/util/inv/AdaptorPlayerHand.java @@ -1,5 +1,7 @@ + package appeng.util.inv; + import java.util.Iterator; import net.minecraft.entity.player.EntityPlayer; @@ -9,6 +11,7 @@ import appeng.util.Platform; import appeng.util.iterators.NullIterator; + /* * Lets you do simply tests with the players cursor, without messing with the specifics. */ @@ -17,12 +20,13 @@ public class AdaptorPlayerHand extends InventoryAdaptor private final EntityPlayer p; - public AdaptorPlayerHand(EntityPlayer _p) { + public AdaptorPlayerHand( EntityPlayer _p ) + { p = _p; } @Override - public ItemStack removeSimilarItems(int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest) + public ItemStack removeSimilarItems( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest ) { ItemStack hand = p.inventory.getItemStack(); if ( hand == null ) @@ -42,7 +46,7 @@ public ItemStack removeSimilarItems(int how_many, ItemStack Filter, FuzzyMode fu } @Override - public ItemStack simulateSimilarRemove(int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest) + public ItemStack simulateSimilarRemove( int how_many, ItemStack Filter, FuzzyMode fuzzyMode, IInventoryDestination dest ) { ItemStack hand = p.inventory.getItemStack(); @@ -60,7 +64,7 @@ public ItemStack simulateSimilarRemove(int how_many, ItemStack Filter, FuzzyMode } @Override - public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestination dest) + public ItemStack removeItems( int how_many, ItemStack Filter, IInventoryDestination dest ) { ItemStack hand = p.inventory.getItemStack(); if ( hand == null ) @@ -80,7 +84,7 @@ public ItemStack removeItems(int how_many, ItemStack Filter, IInventoryDestinati } @Override - public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestination dest) + public ItemStack simulateRemove( int how_many, ItemStack Filter, IInventoryDestination dest ) { ItemStack hand = p.inventory.getItemStack(); @@ -98,7 +102,7 @@ public ItemStack simulateRemove(int how_many, ItemStack Filter, IInventoryDestin } @Override - public ItemStack addItems(ItemStack A) + public ItemStack addItems( ItemStack A ) { if ( A == null ) @@ -112,7 +116,7 @@ public ItemStack addItems(ItemStack A) ItemStack hand = p.inventory.getItemStack(); - if ( hand != null && !Platform.isSameItem( A, hand ) ) + if ( hand != null && !Platform.isSameItemPrecise( A, hand ) ) return A; int original = 0; @@ -140,7 +144,7 @@ public ItemStack addItems(ItemStack A) } @Override - public ItemStack simulateAdd(ItemStack A) + public ItemStack simulateAdd( ItemStack A ) { ItemStack hand = p.inventory.getItemStack(); if ( A == null )