diff options
author | Martin Robertz <dream-master@gmx.net> | 2018-09-06 08:40:35 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-06 08:40:35 +0200 |
commit | 8043ad2663d07bd97d7eaf7c9dcaaac72c413e72 (patch) | |
tree | 11351ed8e8ff50d06a985956ecb5f90a75842de9 /src/main/java/gregtech/api/util | |
parent | 9d530773035ad21cffb1f558fa8309a57021c3b2 (diff) | |
parent | 9cd17d07c543a14a80672fa709c419f7c580a344 (diff) | |
download | GT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.tar.gz GT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.tar.bz2 GT5-Unofficial-8043ad2663d07bd97d7eaf7c9dcaaac72c413e72.zip |
Merge pull request #144 from GTNewHorizons/pipe_overhaul_and_fluidfilter_fix
Pipe/Cable overhaul & Add filter output on fluid filters
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r-- | src/main/java/gregtech/api/util/GT_Utility.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index daa02d8b85..4a2fa78a62 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -365,9 +365,11 @@ public class GT_Utility { public static boolean isConnectableNonInventoryPipe(Object aTileEntity, int aSide) { if (aTileEntity == null) return false; checkAvailabilities(); - if (TE_CHECK) if (aTileEntity instanceof IItemDuct) return true; - if (BC_CHECK) if (aTileEntity instanceof buildcraft.api.transport.IPipeTile) + if (TE_CHECK && aTileEntity instanceof IItemDuct) return true; + if (BC_CHECK && aTileEntity instanceof buildcraft.api.transport.IPipeTile) return ((buildcraft.api.transport.IPipeTile) aTileEntity).isPipeConnected(ForgeDirection.getOrientation(aSide)); + if (GregTech_API.mTranslocator && aTileEntity instanceof codechicken.translocator.TileItemTranslocator) return true; + return false; } /** |