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

Fixed #177 - Gear shaft powering gear without touching it

Browse source
This commit is contained in:
Calclavia 2014-01-31 19:19:09 +08:00
parent 8d22221c5d
commit 4d0e45c3c7
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/resonantinduction/archaic/firebox/BlockHotPlate.java
View file

@ -26,7 +26,7 @@ public class BlockHotPlate extends BlockRI
public BlockHotPlate() public BlockHotPlate()
{ {
super("hotPlate", Material.wood); super("hotPlate", Material.rock);
setBlockBounds(0, 0, 0, 1, 0.2f, 1); setBlockBounds(0, 0, 0, 1, 0.2f, 1);
setTickRandomly(true); setTickRandomly(true);
} }

3
src/main/java/resonantinduction/mechanical/gear/PartGear.java
View file

@ -206,6 +206,7 @@ public class PartGear extends PartMechanical implements IMechanical, IMultiBlock
{ {
displaceCheck = 2; displaceCheck = 2;
} }
/** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */ /** Look for gears outside this block space, the relative UP, DOWN, LEFT, RIGHT */
for (int i = 0; i < 4; i++) 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); 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; connections[checkDir.ordinal()] = instance;
getNetwork().merge(instance.getNetwork()); getNetwork().merge(instance.getNetwork());