Fixed http://openeye.openmods.info/crashes/90d72b392a1e968ef7dab98f5a65d1d8
This commit is contained in:
@@ -277,13 +277,15 @@ public class BlockCableBus extends AEBaseBlock
|
|||||||
private ICableBusContainer cb(IBlockAccess w, int x, int y, int z)
|
private ICableBusContainer cb(IBlockAccess w, int x, int y, int z)
|
||||||
{
|
{
|
||||||
TileEntity te = w.getTileEntity( x, y, z );
|
TileEntity te = w.getTileEntity( x, y, z );
|
||||||
|
ICableBusContainer out = null;
|
||||||
|
|
||||||
if ( te instanceof TileCableBus )
|
if ( te instanceof TileCableBus )
|
||||||
return ((TileCableBus) te).cb;
|
out = ((TileCableBus) te).cb;
|
||||||
|
|
||||||
if ( AppEng.instance.isIntegrationEnabled( "FMP" ) )
|
else if ( AppEng.instance.isIntegrationEnabled( "FMP" ) )
|
||||||
return ((IFMP) AppEng.instance.getIntegration( "FMP" )).getCableContainer( te );
|
out = ((IFMP) AppEng.instance.getIntegration( "FMP" )).getCableContainer( te );
|
||||||
|
|
||||||
return nullCB;
|
return out == null ? nullCB : out;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user