Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed client side not working with conveyor belts

Browse source
This commit is contained in:
Calclavia 2012-10-28 16:20:29 +08:00
parent ead4de1a27
commit d7576fa983
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/common/assemblyline/belts/TileEntityConveyorBelt.java
View file

@ -44,7 +44,6 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
public int clearCount = 0; public int clearCount = 0;
public int range = 0; public int range = 0;
public boolean connected = false;
public List<Entity> entityIgnoreList = new ArrayList<Entity>(); public List<Entity> entityIgnoreList = new ArrayList<Entity>();
/** /**
@ -92,13 +91,9 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
if (this.ticks % 20 == 0) if (this.ticks % 20 == 0)
{ {
if (worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord) instanceof IConductor) if (!worldObj.isRemote)
{ {
this.connected = true; PacketManager.sendPacketToClients(this.getDescriptionPacket(), this.worldObj, Vector3.get(this), 15);
}
else
{
this.connected = false;
} }
if (this.wattsReceived >= JOULES_REQUIRED) if (this.wattsReceived >= JOULES_REQUIRED)
@ -111,7 +106,7 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
this.range = 0; this.range = 0;
} }
if (!this.connected) if (!(worldObj.getBlockTileEntity(xCoord, yCoord - 1, zCoord) instanceof IConductor))
{ {
searchNeighborBelts(); searchNeighborBelts();
} }
@ -125,12 +120,8 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
this.running = false; this.running = false;
} }
if (!worldObj.isRemote)
{
PacketManager.sendPacketToClients(this.getDescriptionPacket(), this.worldObj, Vector3.get(this), 15);
} }
}
if (this.running) if (this.running)
{ {
AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1); AxisAlignedBB bounds = AxisAlignedBB.getBoundingBox(this.xCoord, this.yCoord, this.zCoord, this.xCoord + 1, this.yCoord + 1, this.zCoord + 1);
@ -199,7 +190,7 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
@Override @Override
public Packet getDescriptionPacket() public Packet getDescriptionPacket()
{ {
return PacketManager.getPacket(AssemblyLine.CHANNEL, this, this.running, this.range); return PacketManager.getPacket(AssemblyLine.CHANNEL, this, this.wattsReceived);
} }
@Override @Override
@ -296,9 +287,7 @@ public class TileEntityConveyorBelt extends TileEntityElectricityReceiver implem
{ {
try try
{ {
this.running = dataStream.readBoolean(); this.wattsReceived = dataStream.readDouble();
this.range = dataStream.readInt();
} }
catch (Exception e) catch (Exception e)
{ {