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

Mis-commit

Browse source
This commit is contained in:
Brian Ricketts 2012-12-28 14:43:24 -06:00
parent 0bc33ea862
commit 46c59251fc
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java
View file

@ -34,7 +34,12 @@ public class TileEntityDetector extends TileEntityAdvanced implements IFilterabl
@Override
public void updateEntity()
{
<<<<<<< Updated upstream
super.updateEntity();
=======
int metadata = this.worldObj.getBlockMetadata(xCoord, yCoord, zCoord) & 3;
AxisAlignedBB testArea = AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord - 1, this.zCoord, this.xCoord + 1, this.yCoord, this.zCoord + 1);
>>>>>>> Stashed changes
if (!this.worldObj.isRemote && this.ticks % 10 == 0)
{