From 50c1f307930d166611edfdaa9fad58816c6e50e6 Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Mon, 24 Jun 2013 16:10:32 -0400 Subject: [PATCH] Fixed spaces in config file --- src/minecraft/dark/fluid/common/FluidMech.java | 4 ++-- src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/minecraft/dark/fluid/common/FluidMech.java b/src/minecraft/dark/fluid/common/FluidMech.java index 6c5033b4..d8ac9ad9 100644 --- a/src/minecraft/dark/fluid/common/FluidMech.java +++ b/src/minecraft/dark/fluid/common/FluidMech.java @@ -161,9 +161,9 @@ public class FluidMech extends DummyModContainer /* BLOCK DECLARATION -- CONFIG LOADER */ blockGenPipe = new BlockPipe(FluidMech.CONFIGURATION.getBlock("Pipes", BLOCK_ID_PREFIX).getInt()); blockMachine = new BlockPumpMachine(FluidMech.CONFIGURATION.getBlock("Machines", BLOCK_ID_PREFIX + 1).getInt()); - blockRod = new BlockRod(FluidMech.CONFIGURATION.getBlock("Mechanical Rod", BLOCK_ID_PREFIX + 3).getInt()); + blockRod = new BlockRod(FluidMech.CONFIGURATION.getBlock("MechRod", BLOCK_ID_PREFIX + 3).getInt()); blockGenerator = new BlockGenerator((FluidMech.CONFIGURATION.getBlock("Generator", BLOCK_ID_PREFIX + 4).getInt())); - blockReleaseValve = new BlockReleaseValve((FluidMech.CONFIGURATION.getBlock("Release Valve", BLOCK_ID_PREFIX + 5).getInt())); + blockReleaseValve = new BlockReleaseValve((FluidMech.CONFIGURATION.getBlock("ReleaseValve", BLOCK_ID_PREFIX + 5).getInt())); blockTank = new BlockTank(FluidMech.CONFIGURATION.getBlock("Tank", BLOCK_ID_PREFIX + 6).getInt()); blockWasteLiquid = new BlockWasteLiquid(FluidMech.CONFIGURATION.getBlock("WasteLiquid", BLOCK_ID_PREFIX + 7).getInt()); blockSink = new BlockSink(FluidMech.CONFIGURATION.getBlock("Sink", BLOCK_ID_PREFIX + 8).getInt()); diff --git a/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java b/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java index 9ba85750..2b1da290 100644 --- a/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java +++ b/src/minecraft/dark/fluid/common/pump/LiquidPathFinder.java @@ -55,8 +55,12 @@ public class LiquidPathFinder /** * @return True on success finding, false on failure. */ - public boolean findNodes(final Vector3 node) + public boolean findNodes(Vector3 node) { + if(node == null) + { + return true; + } try { Vector3 vec = node.clone();