Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch '6.3.x' of github.com:BuildCraft/BuildCraft into 6.3.x

Browse source
This commit is contained in:
asiekierka 2014-12-15 17:32:39 +01:00
commit 078ff84fd7
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/buildcraft/transport/BlockGenericPipe.java
View file

@ -1312,8 +1312,7 @@ public class BlockGenericPipe extends BlockBuildCraft {
public boolean recolourBlock(World world, int x, int y, int z, ForgeDirection side, int colour) {
TileGenericPipe pipeTile = (TileGenericPipe) world.getTileEntity(x, y, z);
if (!pipeTile.hasPlug(side)) {
pipeTile.setColor(colour);
return true;
return pipeTile.setColor(colour);
}
return false;

6
common/buildcraft/transport/TileGenericPipe.java
View file

@ -433,13 +433,15 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler,
return worldObj.isRemote ? renderState.glassColor : this.glassColor;
}
public void setColor(int color) {
public boolean setColor(int color) {
// -1 = no color
if (!worldObj.isRemote && color >= -1 && color < 16) {
if (!worldObj.isRemote && color >= -1 && color < 16 && glassColor != color) {
glassColor = color;
notifyBlockChanged();
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, blockType);
return true;
}
return false;
}
/**