tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Merge pull request #1665 from yueh/fix-1656

Browse source 
Fixes #1656 Reduces the amount of block updates a controller sends.
This commit is contained in:
yueh 2015-07-14 21:29:39 +02:00
parent e9e9535f2a f5e3ae8949
commit 62fb0dc7f7
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/appeng/tile/networking/TileController.java
View file

@ -70,15 +70,15 @@ public class TileController extends AENetworkPowerTile
public void onNeighborChange( boolean force ) public void onNeighborChange( boolean force )
{ {
boolean xx = this.worldObj.getTileEntity( this.xCoord - 1, this.yCoord, this.zCoord ) instanceof TileController && this.worldObj.getTileEntity( this.xCoord + 1, this.yCoord, this.zCoord ) instanceof TileController; final boolean xx = checkController( this.xCoord - 1, this.yCoord, this.zCoord ) && checkController( this.xCoord + 1, this.yCoord, this.zCoord );
boolean yy = this.worldObj.getTileEntity( this.xCoord, this.yCoord - 1, this.zCoord ) instanceof TileController && this.worldObj.getTileEntity( this.xCoord, this.yCoord + 1, this.zCoord ) instanceof TileController; final boolean yy = checkController( this.xCoord, this.yCoord - 1, this.zCoord ) && checkController( this.xCoord, this.yCoord + 1, this.zCoord );
boolean zz = this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord - 1 ) instanceof TileController && this.worldObj.getTileEntity( this.xCoord, this.yCoord, this.zCoord + 1 ) instanceof TileController; final boolean zz = checkController( this.xCoord, this.yCoord, this.zCoord - 1 ) && checkController( this.xCoord, this.yCoord, this.zCoord + 1 );
// int meta = world.getBlockMetadata( xCoord, yCoord, zCoord ); // int meta = world.getBlockMetadata( xCoord, yCoord, zCoord );
// boolean hasPower = meta > 0; // boolean hasPower = meta > 0;
// boolean isConflict = meta == 2; // boolean isConflict = meta == 2;
boolean oldValid = this.isValid; final boolean oldValid = this.isValid;
this.isValid = ( xx && !yy && !zz ) || ( !xx && yy && !zz ) || ( !xx && !yy && zz ) || ( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) <= 1 ); this.isValid = ( xx && !yy && !zz ) || ( !xx && yy && !zz ) || ( !xx && !yy && zz ) || ( ( xx ? 1 : 0 ) + ( yy ? 1 : 0 ) + ( zz ? 1 : 0 ) <= 1 );
@ -92,9 +92,10 @@ public class TileController extends AENetworkPowerTile
{ {
this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) ); this.gridProxy.setValidSides( EnumSet.noneOf( ForgeDirection.class ) );
} }
this.updateMeta();
} }
this.updateMeta();
} }
private void updateMeta() private void updateMeta()
@ -123,7 +124,10 @@ public class TileController extends AENetworkPowerTile
meta = 0; meta = 0;
} }
this.worldObj.setBlockMetadataWithNotify( this.xCoord, this.yCoord, this.zCoord, meta, 2 ); if( checkController( this.xCoord, this.yCoord, this.zCoord ) && this.worldObj.getBlockMetadata( this.xCoord, this.yCoord, this.zCoord ) != meta )
{
this.worldObj.setBlockMetadataWithNotify( this.xCoord, this.yCoord, this.zCoord, meta, 2 );
}
} }
@Override @Override
@ -199,6 +203,20 @@ public class TileController extends AENetworkPowerTile
@Override @Override
public int[] getAccessibleSlotsBySide( ForgeDirection side ) public int[] getAccessibleSlotsBySide( ForgeDirection side )
{ {
return this.ACCESSIBLE_SLOTS_BY_SIDE; return ACCESSIBLE_SLOTS_BY_SIDE;
}
/**
* Check for a controller at this coordinates as well as is it loaded.
*
* @return true if there is a loaded controller
*/
private boolean checkController( int x, int y, int z )
{
if( this.worldObj.getChunkProvider().chunkExists( this.xCoord >> 4, this.zCoord >> 4 ) )
{
return this.worldObj.getTileEntity( x, y, z ) instanceof TileController;
}
return false;
} }
} }