From 2d1dabd6b29ea9d20dc48769c539a6b08c8dd7c6 Mon Sep 17 00:00:00 2001 From: Aidan Brady Date: Wed, 20 Nov 2013 07:20:32 -0500 Subject: [PATCH] Fix a few crashes --- common/mekanism/common/item/ItemBlockMachine.java | 2 +- common/mekanism/induction/client/gui/GuiMultimeter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java index 1062a04fa..00cb9dc7e 100644 --- a/common/mekanism/common/item/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -252,7 +252,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, IItem { if(isElectricChest(itemstack)) { - if(!world.isRemote) + if(world != null && !world.isRemote) { InventoryElectricChest inv = new InventoryElectricChest(itemstack); diff --git a/common/mekanism/induction/client/gui/GuiMultimeter.java b/common/mekanism/induction/client/gui/GuiMultimeter.java index 977abd995..393435a9d 100644 --- a/common/mekanism/induction/client/gui/GuiMultimeter.java +++ b/common/mekanism/induction/client/gui/GuiMultimeter.java @@ -66,7 +66,7 @@ public class GuiMultimeter extends GuiContainer data.add((byte)3); data.add(Float.parseFloat(textFieldLimit.getText())); - PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity)), data); + PacketHandler.sendPacket(Transmission.SERVER, new PacketTileEntity().setParams(Object3D.get(tileEntity), data)); } @Override