From fa71836e0d2c19882aca50c96afb80821583964a Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 22 May 2015 13:06:46 -0400 Subject: [PATCH] Fixed bad cast, fixed tubes and pipes losing capacity after world load --- src/main/java/mekanism/api/gas/GasNetwork.java | 6 ++++-- src/main/java/mekanism/common/FluidNetwork.java | 5 +++-- .../java/mekanism/common/multipart/PartMechanicalPipe.java | 5 +++-- .../java/mekanism/common/multipart/PartPressurizedTube.java | 4 ++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index ae27c1188..8ad11c02f 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -295,12 +295,14 @@ public class GasNetwork extends DynamicNetwork for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); - IGasHandler acceptor = (IGasHandler)coord.getTileEntity(getWorld()); + TileEntity tile = coord.getTileEntity(getWorld()); - if(sides == null || sides.isEmpty()) + if(!(tile instanceof IGasHandler) || sides == null || sides.isEmpty()) { continue; } + + IGasHandler acceptor = (IGasHandler)tile; for(ForgeDirection side : sides) { diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index d3a0ec622..7ced4d445 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -295,13 +295,14 @@ public class FluidNetwork extends DynamicNetwork for(Coord4D coord : possibleAcceptors.keySet()) { EnumSet sides = acceptorDirections.get(coord); + TileEntity tile = coord.getTileEntity(getWorld()); if(sides == null || sides.isEmpty()) { continue; } - - IFluidHandler acceptor = (IFluidHandler)coord.getTileEntity(getWorld()); + + IFluidHandler acceptor = (IFluidHandler)tile; for(ForgeDirection side : sides) { diff --git a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java index 9331d3638..1dc03c251 100644 --- a/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java +++ b/src/main/java/mekanism/common/multipart/PartMechanicalPipe.java @@ -126,13 +126,14 @@ public class PartMechanicalPipe extends PartTransmitter