From d84500c5b72f661d4957a7cbb8e61bfd4ca6f031 Mon Sep 17 00:00:00 2001 From: yueh Date: Sun, 20 Aug 2017 14:35:31 +0200 Subject: [PATCH] Fixes FE P2P tunnel drain issues Only queue drain on modulate, also queue it for extracting from the input side. --- src/main/java/appeng/parts/p2p/PartP2PFEPower.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java index f13d36b8f..720da5f1a 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PFEPower.java +++ b/src/main/java/appeng/parts/p2p/PartP2PFEPower.java @@ -141,7 +141,10 @@ public class PartP2PFEPower extends PartP2PTunnel total += received; } - PartP2PFEPower.this.queueTunnelDrain( PowerUnits.RF, total ); + if( !simulate ) + { + PartP2PFEPower.this.queueTunnelDrain( PowerUnits.RF, total ); + } } catch( GridAccessException ignored ) { @@ -208,7 +211,14 @@ public class PartP2PFEPower extends PartP2PTunnel @Override public int extractEnergy( int maxExtract, boolean simulate ) { - return PartP2PFEPower.this.getAttachedEnergyStorage().extractEnergy( maxExtract, simulate ); + final int total = PartP2PFEPower.this.getAttachedEnergyStorage().extractEnergy( maxExtract, simulate ); + + if( !simulate ) + { + PartP2PFEPower.this.queueTunnelDrain( PowerUnits.RF, total ); + } + + return total; } @Override