Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed multimeter crash

Browse source
This commit is contained in:
Calclavia 2014-01-21 22:24:02 +08:00
parent 9f9bb3db52
commit 79d22687f6
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/resonantinduction/electrical/Electrical.java
View file

@ -41,6 +41,7 @@ import resonantinduction.electrical.wire.ItemWire;
import resonantinduction.mechanical.process.BlockGrinderWheel; import resonantinduction.mechanical.process.BlockGrinderWheel;
import resonantinduction.mechanical.process.TileGrinderWheel; import resonantinduction.mechanical.process.TileGrinderWheel;
import resonantinduction.mechanical.process.TilePurifier; import resonantinduction.mechanical.process.TilePurifier;
import universalelectricity.api.CompatibilityModule;
import calclavia.lib.content.ContentRegistry; import calclavia.lib.content.ContentRegistry;
import calclavia.lib.network.PacketHandler; import calclavia.lib.network.PacketHandler;
import calclavia.lib.recipe.UniversalRecipe; import calclavia.lib.recipe.UniversalRecipe;
@ -143,7 +144,7 @@ public class Electrical
/** /**
* Set reference itemstacks * Set reference itemstacks
*/ */
ResonantInductionTabs.ITEMSTACK = new ItemStack(blockBattery); ResonantInductionTabs.ITEMSTACK = new ItemStack(itemTransformer);
for (EnumWireMaterial material : EnumWireMaterial.values()) for (EnumWireMaterial material : EnumWireMaterial.values())
{ {

10
src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java
View file

@ -224,8 +224,14 @@ public class PartMultimeter extends JCuboidPart implements IPacketReceiver, TFac
{ {
if (tileEntity instanceof IConductor) if (tileEntity instanceof IConductor)
{ {
IEnergyNetwork network = ((IConductor) tileEntity).getInstance(side.getOpposite()).getNetwork(); IConductor conductor = (IConductor) ((IConductor) tileEntity).getInstance(side.getOpposite());
return network.getLastBuffer();
if (conductor != null)
{
// TODO: Conductor may always return null in some cases.
IEnergyNetwork network = conductor.getNetwork();
return network.getLastBuffer();
}
} }
return CompatibilityModule.getEnergy(tileEntity, side); return CompatibilityModule.getEnergy(tileEntity, side);