fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Crash with P2P Tunnels.

Browse Source
This commit is contained in:
AlgorithmX2
2014-01-31 11:39:09 -06:00
parent daa121b5d2
commit 7319b4e6ae
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parts/p2p/PartP2PItems.java
+1 -1
View File
@@ -128,7 +128,7 @@ public class PartP2PItems extends PartP2PTunnel<PartP2PItems> implements IPipeCo
{ {
cachedInv = null; cachedInv = null;
PartP2PItems input = getInput(); PartP2PItems input = getInput();
if ( input != null ) if ( input != null && output )
input.onChange(); input.onChange();
} }
parts/p2p/PartP2PTunnel.java
+7 -4
View File
@@ -231,6 +231,9 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
public T getInput() public T getInput()
{ {
if ( freq == 0 )
return null;
PartP2PTunnel tunn; PartP2PTunnel tunn;
try try
{ {
@@ -263,8 +266,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(),
is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderInventoryBox( renderer ); rh.renderInventoryBox( renderer );
@@ -284,8 +287,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( x, y, z, renderer ); rh.renderBlock( x, y, z, renderer );
rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(),
is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() ); CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
rh.setBounds( 2, 2, 14, 14, 14, 16 ); rh.setBounds( 2, 2, 14, 14, 14, 16 );
rh.renderBlock( x, y, z, renderer ); rh.renderBlock( x, y, z, renderer );