From 76f17ba53c1582aaf1696f4a94db31fdc3046cdb Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Fri, 30 Jun 2017 18:35:38 +0200 Subject: [PATCH] Fixed Network Tool crashing on null ItemStacks. --- src/main/java/appeng/me/helpers/AENetworkProxy.java | 2 +- src/main/java/appeng/parts/misc/PartToggleBus.java | 2 +- src/main/java/appeng/parts/p2p/PartP2PTunnelME.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index a5cab9c73..0e1ad3173 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -63,7 +63,7 @@ public class AENetworkProxy implements IGridBlock private final String nbtName; // name private AEColor myColor = AEColor.TRANSPARENT; private NBTTagCompound data = null; // input - private ItemStack myRepInstance; + private ItemStack myRepInstance = ItemStack.EMPTY; private boolean isReady = false; private IGridNode node = null; private EnumSet validSides; diff --git a/src/main/java/appeng/parts/misc/PartToggleBus.java b/src/main/java/appeng/parts/misc/PartToggleBus.java index 6d9f8ba5c..5d6ef2a92 100644 --- a/src/main/java/appeng/parts/misc/PartToggleBus.java +++ b/src/main/java/appeng/parts/misc/PartToggleBus.java @@ -65,7 +65,7 @@ public class PartToggleBus extends PartBasicState public static final IPartModel MODELS_HAS_CHANNEL = new PartModel( MODEL_BASE, MODEL_STATUS_HAS_CHANNEL ); private static final int REDSTONE_FLAG = 4; - private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); + private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", ItemStack.EMPTY, true ); private IGridConnection connection; private boolean hasRedstone = false; diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java index 8d24cf8e7..5acd1c7e4 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnelME.java @@ -63,7 +63,7 @@ public class PartP2PTunnelME extends PartP2PTunnel implements I } private final Connections connection = new Connections( this ); - private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", null, true ); + private final AENetworkProxy outerProxy = new AENetworkProxy( this, "outer", ItemStack.EMPTY, true ); public PartP2PTunnelME( final ItemStack is ) {