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

Fixed minor bugs

Browse source
This commit is contained in:
Henry Mao 2013-01-06 17:20:11 +08:00
parent cb22292c9a
commit dbe53cbe41
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,7 +54,7 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
@Override
protected void onUpdate()
{
if (FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
if (!this.worldObj.isRemote)
{
if (this.ticks % 20 == 0)
{
@ -225,7 +225,6 @@ public class TileEntityManipulator extends TileEntityFilterable implements IReds
/**
* Try to put items into a chest.
*/
//System.out.println(itemStack.hashCode() + " @ " + direction.toString());
if (tileEntity instanceof TileEntityChest)
{
TileEntityChest[] chests = { (TileEntityChest) tileEntity, null };

8
src/minecraft/assemblyline/common/machine/belt/BlockConveyorBelt.java
View file

@ -154,7 +154,7 @@ public class BlockConveyorBelt extends BlockMachine
}
((EntityItem) entity).age++;
((EntityItem) entity).delayBeforeCanPickup = 2;
((EntityItem) entity).delayBeforeCanPickup = 20;
entity.onGround = false;
}
@ -203,4 +203,10 @@ public class BlockConveyorBelt extends BlockMachine
{
return false;
}
@Override
public int damageDropped(int par1)
{
return 0;
}
}