diff options
| author | Martin Robertz <dream-master@gmx.net> | 2018-03-26 08:30:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-26 08:30:19 +0200 |
| commit | 921bf4bf8eabb643764f74eaf5f181b58c8c0baf (patch) | |
| tree | 51ab7910572bbcdada4e2a06fdcf5cffe39af76a /src/main | |
| parent | 63298b0d725f9170565cc8f46b99108059f079de (diff) | |
| parent | ea6857029cd9e15152ff2c656d9684ee6578a29d (diff) | |
| download | GT5-Unofficial-921bf4bf8eabb643764f74eaf5f181b58c8c0baf.tar.gz GT5-Unofficial-921bf4bf8eabb643764f74eaf5f181b58c8c0baf.tar.bz2 GT5-Unofficial-921bf4bf8eabb643764f74eaf5f181b58c8c0baf.zip | |
Merge pull request #110 from codewarrior0/patch-4
Fix transformers not exploding when receiving overvoltage through P2P-EU tunnels
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java index 8d99cd1208..fd183d9e79 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Transformer.java @@ -1,5 +1,6 @@ package gregtech.api.metatileentity.implementations; +import appeng.api.parts.IPartHost; import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyStorage; import crazypants.enderio.machine.capbank.TileCapBank; @@ -150,7 +151,7 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi if (tTileEntity instanceof IReactorChamber) { tTileEntity = (TileEntity) ((IReactorChamber) tTileEntity).getReactor(); } - if (tTileEntity instanceof IEnergySource && ((IEnergySource) tTileEntity).emitsEnergyTo((TileEntity) aBaseMetaTileEntity, ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)))) { + if (tTileEntity instanceof IEnergySource && !(tTileEntity instanceof IPartHost) && ((IEnergySource) tTileEntity).emitsEnergyTo((TileEntity) aBaseMetaTileEntity, ForgeDirection.getOrientation(GT_Utility.getOppositeSide(i)))) { long tEU = Math.min(maxEUInput(), (long) ((IEnergySource) tTileEntity).getOfferedEnergy()); ((IEnergySource) tTileEntity).drawEnergy(tEU); aBaseMetaTileEntity.injectEnergyUnits((byte) 6, tEU, 1); @@ -225,4 +226,4 @@ public class GT_MetaTileEntity_Transformer extends GT_MetaTileEntity_TieredMachi maxAmperesOut() + trans("149","A"); } -}
\ No newline at end of file +} |