tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed duplication bug

Browse source
This commit is contained in:
Brian Ricketts 2013-01-04 12:20:53 -06:00
parent 16d9bd48cd
commit cb6cc049d2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
View file

@ -16,7 +16,9 @@ import universalelectricity.prefab.implement.IRedstoneReceptor;
import universalelectricity.prefab.network.PacketManager; import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IManipulator; import assemblyline.api.IManipulator;
import assemblyline.common.machine.imprinter.TileEntityImprintable; import assemblyline.common.machine.imprinter.TileEntityImprintable;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.PacketDispatcher; import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
public class TileEntityManipulator extends TileEntityImprintable implements IRedstoneReceptor, IManipulator public class TileEntityManipulator extends TileEntityImprintable implements IRedstoneReceptor, IManipulator
{ {
@ -52,7 +54,7 @@ public class TileEntityManipulator extends TileEntityImprintable implements IRed
@Override @Override
protected void onUpdate() protected void onUpdate()
{ {
if (!this.worldObj.isRemote) if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
{ {
if (this.ticks % 20 == 0) if (this.ticks % 20 == 0)
{ {
@ -107,6 +109,8 @@ public class TileEntityManipulator extends TileEntityImprintable implements IRed
for (EntityItem entity : itemsInBound) for (EntityItem entity : itemsInBound)
{ {
if (entity.isDead)
continue;
/** /**
* Try top first, then bottom, then the sides to see if it is possible to insert the * Try top first, then bottom, then the sides to see if it is possible to insert the
* item into a inventory. * item into a inventory.
@ -221,6 +225,7 @@ public class TileEntityManipulator extends TileEntityImprintable implements IRed
/** /**
* Try to put items into a chest. * Try to put items into a chest.
*/ */
//System.out.println(itemStack.hashCode() + " @ " + direction.toString());
if (tileEntity instanceof TileEntityChest) if (tileEntity instanceof TileEntityChest)
{ {
TileEntityChest[] chests = { (TileEntityChest) tileEntity, null }; TileEntityChest[] chests = { (TileEntityChest) tileEntity, null };