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

Revert "Cable Null checks for EVERYTHING!"

Browse Source 
This reverts commit 57d4541418.

This was already resolved - this is a duplicate fix.
This commit is contained in:
AlgorithmX2
2014-05-29 15:01:42 -05:00
parent e17ac60141
commit 623e3aa228
1 changed files with 37 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
block/networking/BlockCableBus.java
+37 -54
View File
@@ -89,8 +89,7 @@ public class BlockCableBus extends AEBaseBlock
@Override
public boolean isLadder(IBlockAccess world, int x, int y, int z, EntityLivingBase entity)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? false : cbc.isLadder( entity );
return cb( world, x, y, z ).isLadder( entity );
}
@Override
@@ -101,33 +100,33 @@ public class BlockCableBus extends AEBaseBlock
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour, EntityPlayer who)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? false : cbc.recolourBlock( side, colour, who );
try
{
return cb( world, x, y, z ).recolourBlock( side, colour, who );
}
catch (Throwable t)
{
}
return false;
}
@Override
public void randomDisplayTick(World world, int x, int y, int z, Random r)
{
ICableBusContainer cbc = cb( world, x, y, z );
if( cbc != null )
cbc.randomDisplayTick( world, x, y, z, r );
cb( world, x, y, z ).randomDisplayTick( world, x, y, z, r );
}
@Override
public int getLightValue(IBlockAccess world, int x, int y, int z)
{
Block block = world.getBlock( x, y, z );
if ( block != null && block != this )
{
return block.getLightValue( world, x, y, z );
}
if ( block == null )
return 0;
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? 0 : cbc.getLightValue();
return cb( world, x, y, z ).getLightValue();
}
@Override
@@ -147,8 +146,7 @@ public class BlockCableBus extends AEBaseBlock
@Override
public boolean isReplaceable(IBlockAccess world, int x, int y, int z)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? false : cbc.isEmpty();
return cb( world, x, y, z ).isEmpty();
}
@Override
@@ -161,7 +159,6 @@ public class BlockCableBus extends AEBaseBlock
tile.dropItems = false;
// maybe ray trace?
}
return super.removedByPlayer( world, player, x, y, z );
}
@@ -200,18 +197,15 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side)
public boolean isSideSolid(IBlockAccess w, int x, int y, int z, ForgeDirection side)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? false : cbc.isSolidOnSide( side );
return cb( w, x, y, z ).isSolidOnSide( side );
}
@Override
public void onNeighborBlockChange(World world, int x, int y, int z, Block meh)
public void onNeighborBlockChange(World w, int x, int y, int z, Block meh)
{
ICableBusContainer cbc = cb( world, x, y, z );
if ( cbc != null )
cbc.onNeighborChanged();
cb( w, x, y, z ).onNeighborChanged();
}
@Override
@@ -221,58 +215,47 @@ public class BlockCableBus extends AEBaseBlock
}
@Override
public boolean onActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? false : cbc.activate( player, world.getWorldVec3Pool().getVecFromPool( hitX, hitY, hitZ ) );
return cb( w, x, y, z ).activate( player, w.getWorldVec3Pool().getVecFromPool( hitX, hitY, hitZ ) );
}
@Override
public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e)
public void onEntityCollidedWithBlock(World w, int x, int y, int z, Entity e)
{
ICableBusContainer cbc = cb( world, x, y, z );
if ( cbc != null )
cbc.onEntityCollision( e );
cb( w, x, y, z ).onEntityCollision( e );
}
@Override
public boolean canConnectRedstone(IBlockAccess world, int x, int y, int z, int side)
public boolean canConnectRedstone(IBlockAccess w, int x, int y, int z, int side)
{
ICableBusContainer cbc = cb( world, x, y, z );
if ( cbc != null )
switch (side)
{
switch (side)
{
case -1:
case 4:
return cb( world, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN ) );
case 0:
return cb( world, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.NORTH ) );
case 1:
return cb( world, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.EAST ) );
case 2:
return cb( world, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.SOUTH ) );
case 3:
return cb( world, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.WEST ) );
}
case -1:
case 4:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.UP, ForgeDirection.DOWN ) );
case 0:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.NORTH ) );
case 1:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.EAST ) );
case 2:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.SOUTH ) );
case 3:
return cb( w, x, y, z ).canConnectRedstone( EnumSet.of( ForgeDirection.WEST ) );
}
return false;
}
@Override
public int isProvidingWeakPower(IBlockAccess world, int x, int y, int z, int side)
public int isProvidingWeakPower(IBlockAccess w, int x, int y, int z, int side)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? 0 : cbc.isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
return cb( w, x, y, z ).isProvidingWeakPower( ForgeDirection.getOrientation( side ).getOpposite() );
}
@Override
public int isProvidingStrongPower(IBlockAccess world, int x, int y, int z, int side)
public int isProvidingStrongPower(IBlockAccess w, int x, int y, int z, int side)
{
ICableBusContainer cbc = cb( world, x, y, z );
return cbc == null ? 0 : cbc.isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
return cb( w, x, y, z ).isProvidingStrongPower( ForgeDirection.getOrientation( side ).getOpposite() );
}
@Override