diff --git a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java index 78523899d..273eb3a80 100644 --- a/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java +++ b/electrical/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java @@ -286,6 +286,7 @@ public class PartMultimeter extends PartFace implements IConnector { super(MechanicalNode.class); add(node); + NetworkTickHandler.addNetwork(this); } } diff --git a/mechanical/src/main/java/resonantinduction/mechanical/energy/network/MechanicalNode.java b/mechanical/src/main/java/resonantinduction/mechanical/energy/network/MechanicalNode.java index 82550765d..5b81cb304 100644 --- a/mechanical/src/main/java/resonantinduction/mechanical/energy/network/MechanicalNode.java +++ b/mechanical/src/main/java/resonantinduction/mechanical/energy/network/MechanicalNode.java @@ -28,7 +28,7 @@ public class MechanicalNode extends EnergyNode */ public double angle = 0; - protected double load = 1; + protected double load = 5; protected byte connectionMap = Byte.parseByte("111111", 2); private double power = 0; @@ -68,13 +68,14 @@ public class MechanicalNode extends EnergyNode angle = angle % (Math.PI * 2); } - if (!world().isRemote) + //TODO: Remove upon split. + if (world() != null && !world().isRemote) { /** * Loss energy */ - torque -= torque * torque * getTorqueLoad() * deltaTime; - angularVelocity -= angularVelocity * angularVelocity * getAngularVelocityLoad() * deltaTime; + torque -= torque * getTorqueLoad() * deltaTime; + angularVelocity -= angularVelocity * getAngularVelocityLoad() * deltaTime; synchronized (connections) {