diff options
| author | Jason Mitchell <mitchej+github@gmail.com> | 2018-09-16 17:08:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-16 17:08:37 -0700 |
| commit | 3cce53ccc294c7686d2c4b7bffbedc6e182cb06d (patch) | |
| tree | bcb2b1f6eece928fe13b581dc193548823e3aea8 /src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | |
| parent | 08ccb2df5222870e3a12fc8df7e8fc594ca71902 (diff) | |
| parent | 189ae4c82675db3bbd894860ea6e465ad679f874 (diff) | |
| download | GT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.tar.gz GT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.tar.bz2 GT5-Unofficial-3cce53ccc294c7686d2c4b7bffbedc6e182cb06d.zip | |
Merge pull request #150 from GTNewHorizons/work_with_gtpp_cables
Work with subclassed GT cables (ie: gt++ cables)
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java index 421b0e3e30..7129c174df 100644 --- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java @@ -780,7 +780,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { if ((alwaysLookConnected || letsIn || letsOut)) {
// Are we trying to connect to a pipe? let's do it!
IMetaTileEntity tPipe = tTileEntity instanceof IGregTechTileEntity ? ((IGregTechTileEntity) tTileEntity).getMetaTileEntity() : null;
- if (getClass().isInstance(tPipe)) {
+ if (getClass().isInstance(tPipe) || (tPipe != null && tPipe.getClass().isInstance(this))) {
connectAtSide(aSide);
if (!((MetaPipeEntity) tPipe).isConnectedAtSide(tSide)) {
// Make sure pipes all get together -- connect back to us if we're connecting to a pipe
@@ -824,7 +824,7 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable { byte tSide = GT_Utility.getOppositeSide(aSide);
IGregTechTileEntity tTileEntity = getBaseMetaTileEntity().getIGregTechTileEntityAtSide(aSide);
IMetaTileEntity tPipe = tTileEntity == null ? null : tTileEntity.getMetaTileEntity();
- if (this.getClass().isInstance(tPipe) && ((MetaPipeEntity) tPipe).isConnectedAtSide(tSide))
+ if ((this.getClass().isInstance(tPipe) || (tPipe != null && tPipe.getClass().isInstance(this))) && ((MetaPipeEntity) tPipe).isConnectedAtSide(tSide))
((MetaPipeEntity) tPipe).disconnect(tSide);
}
|