fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	tile/misc/TileCellWorkbench.java
This commit is contained in:
AlgorithmX2
2014-04-06 18:20:20 -05:00
parent 13b3555d01 1ae63261ed
commit 2e103efab8
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tile/misc/TileCellWorkbench.java
+15
View File
@@ -1,8 +1,11 @@
package appeng.tile.misc; package appeng.tile.misc;
import java.util.ArrayList;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import appeng.api.config.CopyMode; import appeng.api.config.CopyMode;
import appeng.api.config.Settings; import appeng.api.config.Settings;
import appeng.api.config.Upgrades; import appeng.api.config.Upgrades;
@@ -182,6 +185,18 @@ public class TileCellWorkbench extends AEBaseTile implements IUpgradeableHost, I
} }
} }
@Override
public void getDrops(World w, int x, int y, int z, ArrayList<ItemStack> drops)
{
super.getDrops( w, x, y, z, drops );
if ( cell.getStackInSlot( 0 ) != null )
{
drops.add( cell.getStackInSlot( 0 ) );
cell.setInventorySlotContents( 0, null );
}
}
public ICellWorkbenchItem getCell() public ICellWorkbenchItem getCell()
{ {
if ( cell.getStackInSlot( 0 ) == null ) if ( cell.getStackInSlot( 0 ) == null )