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

Fixed packets being sent client side, attempted to fix a multiblock connection issue with turbines

Browse source
This commit is contained in:
Robert S 2014-06-09 08:37:32 -04:00
parent 6c67feb482
commit bd6aa3453e
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java
View file

@ -56,12 +56,15 @@ public abstract class TileMechanical extends TileBase implements INodeProvider,
{ {
super.updateEntity(); super.updateEntity();
mechanicalNode.update(); mechanicalNode.update();
if (!this.getWorldObj().isRemote)
{
if (mechanicalNode.markRotationUpdate && ticks % 10 == 0) if (mechanicalNode.markRotationUpdate && ticks % 10 == 0)
{ {
sendRotationPacket(); sendRotationPacket();
mechanicalNode.markRotationUpdate = false; mechanicalNode.markRotationUpdate = false;
} }
} }
}
@Override @Override
public INode getNode(Class<? extends INode> nodeType, ForgeDirection from) public INode getNode(Class<? extends INode> nodeType, ForgeDirection from)

2
mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java
View file

@ -22,7 +22,7 @@ public class TurbineNode extends MechanicalNode
@Override @Override
public boolean canConnect(ForgeDirection from, Object source) public boolean canConnect(ForgeDirection from, Object source)
{ {
return source instanceof MechanicalNode && !(source instanceof TurbineNode) && from == turbine().getDirection().getOpposite(); return turbine().getMultiBlock().isPrimary() && source instanceof MechanicalNode && !(source instanceof TurbineNode) && from == turbine().getDirection().getOpposite();
} }
@Override @Override