From 33f19cf895751842f0673bb4cba2b7a735930893 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Mon, 13 Apr 2015 08:43:08 -0400 Subject: [PATCH] Fixed a crash --- .../content/transporter/TransporterPathfinder.java | 13 +++++++++++-- .../common/multipart/PartLogisticalTransporter.java | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java index d88b8944f..f118b2cf5 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterPathfinder.java @@ -178,14 +178,17 @@ public final class TransporterPathfinder public Destination calculateScore(World world) { score = 0; + for(Coord4D location : path) { TileEntity tile = location.getTileEntity(world); + if(tile instanceof ITransporterTile) { score += ((ITransporterTile)tile).getTransmitter().getCost(); } } + return this; } @@ -223,9 +226,15 @@ public final class TransporterPathfinder public static List getPaths(ILogisticalTransporter start, TransporterStack stack, int min) { - InventoryNetwork network = start.getTransmitterNetwork(); - List acceptors = network.calculateAcceptors(stack.itemStack, stack.color); List paths = new ArrayList(); + InventoryNetwork network = start.getTransmitterNetwork(); + + if(network == null) + { + return paths; + } + + List acceptors = network.calculateAcceptors(stack.itemStack, stack.color); for(AcceptorData entry : acceptors) { diff --git a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java index b182e75c9..eb11521be 100644 --- a/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java +++ b/src/main/java/mekanism/common/multipart/PartLogisticalTransporter.java @@ -446,6 +446,6 @@ public class PartLogisticalTransporter extends PartTransmitter