From 9c8fc0370e6dba05901ce48bed8d6fd9b283d249 Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 10 Jun 2014 20:25:28 -0400 Subject: [PATCH] Fixed MechanicalNode using TMultiPart regardless of what the parent class type --- .../mechanical/energy/grid/MechanicalNode.java | 12 ++++++++++++ .../mechanical/energy/grid/PartMechanical.java | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java index 9b9f374a..b3309fb0 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/MechanicalNode.java @@ -369,18 +369,30 @@ public class MechanicalNode implements IMechanicalNode, ISaveObj, IVectorWorld @Override public double z() { + if(this.getParent() instanceof TileEntity) + { + return ((TileEntity)this.getParent()).zCoord; + } return this.getParent() instanceof TMultiPart && ((TMultiPart) this.getParent()).tile() != null ? ((TMultiPart) this.getParent()).z() : 0; } @Override public double x() { + if(this.getParent() instanceof TileEntity) + { + return ((TileEntity)this.getParent()).xCoord; + } return this.getParent() instanceof TMultiPart && ((TMultiPart) this.getParent()).tile() != null ? ((TMultiPart) this.getParent()).x() : 0; } @Override public double y() { + if(this.getParent() instanceof TileEntity) + { + return ((TileEntity)this.getParent()).yCoord; + } return this.getParent() instanceof TMultiPart && ((TMultiPart) this.getParent()).tile() != null ? ((TMultiPart) this.getParent()).y() : 0; } } diff --git a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java index 30ad36c0..920da296 100644 --- a/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java +++ b/mechanical/src/main/scala/resonantinduction/mechanical/energy/grid/PartMechanical.java @@ -55,7 +55,7 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu } //Make sure to update on both sides - this.node.update(0.05f); + this.node.update(); if (!world().isRemote) {