From 7319b4e6ae9f2dffbd4f32ae82148121e91c279b Mon Sep 17 00:00:00 2001 From: AlgorithmX2 Date: Fri, 31 Jan 2014 11:39:09 -0600 Subject: [PATCH] Fixed Crash with P2P Tunnels. --- parts/p2p/PartP2PItems.java | 2 +- parts/p2p/PartP2PTunnel.java | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/parts/p2p/PartP2PItems.java b/parts/p2p/PartP2PItems.java index aa18814a..72add581 100644 --- a/parts/p2p/PartP2PItems.java +++ b/parts/p2p/PartP2PItems.java @@ -128,7 +128,7 @@ public class PartP2PItems extends PartP2PTunnel implements IPipeCo { cachedInv = null; PartP2PItems input = getInput(); - if ( input != null ) + if ( input != null && output ) input.onChange(); } diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java index a5670dfe..136754f4 100644 --- a/parts/p2p/PartP2PTunnel.java +++ b/parts/p2p/PartP2PTunnel.java @@ -231,6 +231,9 @@ public class PartP2PTunnel extends PartBasicState public T getInput() { + if ( freq == 0 ) + return null; + PartP2PTunnel tunn; try { @@ -263,8 +266,8 @@ public class PartP2PTunnel extends PartBasicState rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), - is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(), + CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderInventoryBox( renderer ); @@ -284,8 +287,8 @@ public class PartP2PTunnel extends PartBasicState rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer ); - rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), - is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); + rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(), + CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.renderBlock( x, y, z, renderer );