From 4d0e45c3c71543093a4e36300cb6d7a399edf17e Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 31 Jan 2014 19:19:09 +0800 Subject: [PATCH] Fixed #177 - Gear shaft powering gear without touching it --- .../java/resonantinduction/archaic/firebox/BlockHotPlate.java | 2 +- src/main/java/resonantinduction/mechanical/gear/PartGear.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java index 332b23279..150c3af3a 100644 --- a/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java +++ b/src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java @@ -26,7 +26,7 @@ public class BlockHotPlate extends BlockRI public BlockHotPlate() { - super("hotPlate", Material.wood); + super("hotPlate", Material.rock); setBlockBounds(0, 0, 0, 1, 0.2f, 1); setTickRandomly(true); } diff --git a/src/main/java/resonantinduction/mechanical/gear/PartGear.java b/src/main/java/resonantinduction/mechanical/gear/PartGear.java index 88acc3b87..94ade8a6a 100644 --- a/src/main/java/resonantinduction/mechanical/gear/PartGear.java +++ b/src/main/java/resonantinduction/mechanical/gear/PartGear.java @@ -206,6 +206,7 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock { displaceCheck = 2; } + /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ for (int i = 0; i < 4; i++) { @@ -216,7 +217,7 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock { IMechanical instance = (IMechanical) ((IMechanical) checkTile).getInstance(placementSide); - if (instance != null && instance != this && instance.canConnect(checkDir.getOpposite(), this)) + if (instance != null && instance != this && instance.canConnect(checkDir.getOpposite(), this) && !(instance instanceof PartGearShaft)) { connections[checkDir.ordinal()] = instance; getNetwork().merge(instance.getNetwork());