From bd6aa3453e6b3aaf5c96f2b7408a4b3669a61573 Mon Sep 17 00:00:00 2001 From: Robert S Date: Mon, 9 Jun 2014 08:37:32 -0400 Subject: [PATCH] Fixed packets being sent client side, attempted to fix a multiblock connection issue with turbines --- .../mechanical/energy/grid/TileMechanical.java | 9 ++++++--- .../mechanical/energy/turbine/TurbineNode.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java index a2ce2623b..c38854252 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/TileMechanical.java @@ -56,10 +56,13 @@ public abstract class TileMechanical extends TileBase implements INodeProvider, { super.updateEntity(); mechanicalNode.update(); - if (mechanicalNode.markRotationUpdate && ticks % 10 == 0) + if (!this.getWorldObj().isRemote) { - sendRotationPacket(); - mechanicalNode.markRotationUpdate = false; + if (mechanicalNode.markRotationUpdate && ticks % 10 == 0) + { + sendRotationPacket(); + mechanicalNode.markRotationUpdate = false; + } } } diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java index 09ed94634..840f843ce 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/turbine/TurbineNode.java @@ -22,7 +22,7 @@ public class TurbineNode extends MechanicalNode @Override 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