Fixes #3363: Energy providers/requesters incorrectly removed on simulate (#3364)

src/main/java/appeng/me/cache/EnergyGridCache.java

@@ -311,26 +311,26 @@ public class EnergyGridCache implements IEnergyGrid
 			final double newPower = node.extractAEPower( req, mode, PowerMultiplier.ONE );
 			extractedPower += newPower;
 
-			if( newPower < req )
+			if( newPower < req && mode == Actionable.MODULATE )
 			{
 				it.remove();
 			}
 		}
 
-		// got more then we wanted?
+		final double result = Math.min( extractedPower, amt );
-		if( extractedPower > amt )
-		{
-			this.localStorage.addCurrentAEPower( extractedPower - amt );
-			this.globalAvailablePower -= amt;
 
-			this.tickDrainPerTick += amt;
+		if( mode == Actionable.MODULATE )
-			return amt;
+		{
+			if( extractedPower > amt )
+			{
+				this.localStorage.addCurrentAEPower( extractedPower - amt );
+			}
+
+			this.globalAvailablePower -= result;
+			this.tickDrainPerTick += result;
 		}
 
-		// go less or the correct amount?
+		return result;
-		this.globalAvailablePower -= extractedPower;
-		this.tickDrainPerTick += extractedPower;
-		return extractedPower;
 	}
 
 	@Override
@@ -345,7 +345,7 @@ public class EnergyGridCache implements IEnergyGrid
 			final IAEPowerStorage node = it.next();
 			amt = node.injectAEPower( amt, mode );
 
-			if( amt > 0 )
+			if( amt > 0 && mode == Actionable.MODULATE )
 			{
 				it.remove();
 			}