Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

2014-05-15 09:35:56 -05:00
parent cfeebae5ac 9ba1b133d7
commit d10e7ee6df
6 changed files with 41 additions and 29 deletions
@@ -862,7 +862,10 @@ public abstract class AEBaseContainer extends Container
 				if ( slotItem != null )
 				{
 					IAEItemStack ais = slotItem.copy();
-					long stackSize = Math.min( ais.getItemStack().getMaxStackSize(), ais.getStackSize() );
+					long maxSize = ais.getItemStack().getMaxStackSize();
+					ais.setStackSize( maxSize );
+					ais = cellInv.extractItems( ais, Actionable.SIMULATE, mySrc );
+					long stackSize = Math.min( maxSize, ais.getStackSize() );
 					ais.setStackSize( (stackSize + 1) >> 1 );
 					ais = Platform.poweredExtraction( powerSrc, cellInv, ais, mySrc );
 					if ( ais != null )
@@ -151,7 +151,7 @@ public class ContainerQuartzKnife extends AEBaseContainer implements IAEAppEngIn
 	@Override
 	public void setInventorySlotContents(int var1, ItemStack var2)
 	{
-		if ( var2 == null )
+		if ( var2 == null && Platform.isServer() )
 			makePlate();
 	}