From 7891ba764005f1f80fc5476578b1598481e045be Mon Sep 17 00:00:00 2001 From: Calclavia Date: Fri, 3 Jan 2014 16:56:37 +0800 Subject: [PATCH] Fixed another missed-out activate null check --- .../wire/flat/PartFlatWire.java | 34 ++++++++++--------- .../wire/framed/PartFramedWire.java | 6 ++-- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/resonantinduction/wire/flat/PartFlatWire.java b/src/main/java/resonantinduction/wire/flat/PartFlatWire.java index d5dfb4a72..2c33055e8 100644 --- a/src/main/java/resonantinduction/wire/flat/PartFlatWire.java +++ b/src/main/java/resonantinduction/wire/flat/PartFlatWire.java @@ -285,33 +285,35 @@ public class PartFlatWire extends PartAdvancedWire implements TFacePart, JNormal { System.out.println(this.getNetwork()); } - TileMultipart tile = tile(); - World w = world(); - if (item.getItem().itemID == Block.lever.blockID) + if (item != null) { - if (!w.isRemote) + if (item.getItem().itemID == Block.lever.blockID) { - PartFlatSwitchWire wire = (PartFlatSwitchWire) MultiPartRegistry.createPart("resonant_induction_flat_switch_wire", false); - wire.copyFrom(this); + TileMultipart tile = tile(); + World w = world(); - if (tile.canReplacePart(this, wire)) + if (!w.isRemote) { - tile.remPart(this); - TileMultipart.addPart(w, new BlockCoord(tile), wire); + PartFlatSwitchWire wire = (PartFlatSwitchWire) MultiPartRegistry.createPart("resonant_induction_flat_switch_wire", false); + wire.copyFrom(this); - if (!player.capabilities.isCreativeMode) + if (tile.canReplacePart(this, wire)) { - player.inventory.decrStackSize(player.inventory.currentItem, 1); + tile.remPart(this); + TileMultipart.addPart(w, new BlockCoord(tile), wire); + + if (!player.capabilities.isCreativeMode) + { + player.inventory.decrStackSize(player.inventory.currentItem, 1); + } } } + return true; } - return true; - } - else - { - return super.activate(player, part, item); } + + return super.activate(player, part, item); } @Override diff --git a/src/main/java/resonantinduction/wire/framed/PartFramedWire.java b/src/main/java/resonantinduction/wire/framed/PartFramedWire.java index 251039915..1a792169d 100644 --- a/src/main/java/resonantinduction/wire/framed/PartFramedWire.java +++ b/src/main/java/resonantinduction/wire/framed/PartFramedWire.java @@ -131,13 +131,13 @@ public class PartFramedWire extends PartAdvancedWire implements TSlottedPart, JN System.out.println(this.getNetwork()); } - TileMultipart tile = tile(); - World w = world(); - if (item != null) { if (item.getItem().itemID == Block.lever.blockID) { + TileMultipart tile = tile(); + World w = world(); + if (!w.isRemote) { PartFramedSwitchWire wire = (PartFramedSwitchWire) MultiPartRegistry.createPart("resonant_induction_switch_wire", false);