From 79d22687f6b2b94749447a64f55ed528a8d23ba1 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Tue, 21 Jan 2014 22:24:02 +0800 Subject: [PATCH] Fixed multimeter crash --- .../java/resonantinduction/electrical/Electrical.java | 3 ++- .../electrical/multimeter/PartMultimeter.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/resonantinduction/electrical/Electrical.java b/src/main/java/resonantinduction/electrical/Electrical.java index 6cc96c50..64e34850 100644 --- a/src/main/java/resonantinduction/electrical/Electrical.java +++ b/src/main/java/resonantinduction/electrical/Electrical.java @@ -41,6 +41,7 @@ import resonantinduction.electrical.wire.ItemWire; import resonantinduction.mechanical.process.BlockGrinderWheel; import resonantinduction.mechanical.process.TileGrinderWheel; import resonantinduction.mechanical.process.TilePurifier; +import universalelectricity.api.CompatibilityModule; import calclavia.lib.content.ContentRegistry; import calclavia.lib.network.PacketHandler; import calclavia.lib.recipe.UniversalRecipe; @@ -143,7 +144,7 @@ public class Electrical /** * Set reference itemstacks */ - ResonantInductionTabs.ITEMSTACK = new ItemStack(blockBattery); + ResonantInductionTabs.ITEMSTACK = new ItemStack(itemTransformer); for (EnumWireMaterial material : EnumWireMaterial.values()) { diff --git a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java index 77d52d39..553d867c 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java +++ b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java @@ -224,8 +224,14 @@ public class PartMultimeter extends JCuboidPart implements IPacketReceiver, TFac { if (tileEntity instanceof IConductor) { - IEnergyNetwork network = ((IConductor) tileEntity).getInstance(side.getOpposite()).getNetwork(); - return network.getLastBuffer(); + IConductor conductor = (IConductor) ((IConductor) tileEntity).getInstance(side.getOpposite()); + + if (conductor != null) + { + // TODO: Conductor may always return null in some cases. + IEnergyNetwork network = conductor.getNetwork(); + return network.getLastBuffer(); + } } return CompatibilityModule.getEnergy(tileEntity, side);