aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity
diff options
context:
space:
mode:
authorrepo-alt <wvk17@yandex.ru>2020-09-02 14:25:05 +0300
committerGitHub <noreply@github.com>2020-09-02 14:25:05 +0300
commit9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8 (patch)
treef77da81ba7c79487de876ed301bd767ca0225f7f /src/main/java/gregtech/api/metatileentity
parentdac85f10d4c97cefc4099816c04fc95cdf1078d9 (diff)
parent05420344ee5a3af1bab32a7e405ac5990da8a37a (diff)
downloadGT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.tar.gz
GT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.tar.bz2
GT5-Unofficial-9c7f9fa6e4ab8d1ad45f43c59ee27ebade3011b8.zip
Merge pull request #311 from repo-alt/experimental
Half baked EU P2P Tunnel removed, in favour of native implementation
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
index 3373b142c4..02d6752bdd 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
@@ -24,7 +24,6 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Client;
import gregtech.common.covers.GT_Cover_SolarPanel;
-import gregtech.loaders.postload.PartP2PGTPower;
import ic2.api.energy.EnergyNet;
import ic2.api.energy.tile.IEnergyEmitter;
import ic2.api.energy.tile.IEnergySink;
@@ -423,8 +422,6 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
// AE2-p2p Compat
if (GT_Mod.gregtechproxy.mAE2Integration) {
- if (tTileEntity instanceof IEnergySource && tTileEntity instanceof IPartHost && ((IPartHost)tTileEntity).getPart(tDir) instanceof PartP2PGTPower && ((IEnergySource) tTileEntity).emitsEnergyTo((TileEntity) baseMetaTile, tDir))
- return true;
if (tTileEntity instanceof appeng.tile.powersink.IC2 && ((appeng.tile.powersink.IC2)tTileEntity).acceptsEnergyFrom((TileEntity)baseMetaTile, tDir))
return true;
}