Merge pull request #2450 from hea3ven/6.4.x
fix wooden pipes not respecting blocking bluggables, fixes #2443
This commit is contained in:
commit
d7617679e5
1 changed files with 8 additions and 1 deletions
|
@ -37,8 +37,11 @@ public abstract class PipeLogicWood {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (newFacing == null) {
|
||||||
|
newFacing = ForgeDirection.UNKNOWN;
|
||||||
|
}
|
||||||
|
|
||||||
if (newFacing != null && newFacing.ordinal() != meta) {
|
if (newFacing.ordinal() != meta) {
|
||||||
pipe.container.getWorldObj().setBlockMetadataWithNotify(pipe.container.xCoord, pipe.container.yCoord, pipe.container.zCoord, newFacing.ordinal(), 3);
|
pipe.container.getWorldObj().setBlockMetadataWithNotify(pipe.container.xCoord, pipe.container.yCoord, pipe.container.zCoord, newFacing.ordinal(), 3);
|
||||||
pipe.container.scheduleRenderUpdate();
|
pipe.container.scheduleRenderUpdate();
|
||||||
}
|
}
|
||||||
|
@ -67,6 +70,10 @@ public abstract class PipeLogicWood {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (pipe.container.hasBlockingPluggable(side)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
TileEntity tile = tileBuffer[side.ordinal()].getTile();
|
TileEntity tile = tileBuffer[side.ordinal()].getTile();
|
||||||
return isValidConnectingTile(tile);
|
return isValidConnectingTile(tile);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue