Fix power calculation resulting in potential infinite EMC void

Closes #4
62832 · May 9, 2024 · 2295174 · 2295174
1 parent 30c470b
commit 2295174
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java b/src/main/java/gripe/_90/appliede/me/service/EMCStorage.java
@@ -291,11 +291,9 @@ private void addKnowledge(AEItemKey what, IKnowledgeProvider provider, Player pl
     }
 
     private long getAmountAfterPowerExpenditure(long maxAmount, IEnergySource source) {
-        var requiredPower = PowerMultiplier.CONFIG.multiply(maxAmount);
-        var availablePower = source.extractAEPower(requiredPower, Actionable.SIMULATE, PowerMultiplier.CONFIG);
-        var powerToExpend = Math.min(requiredPower, availablePower);
-        source.extractAEPower(powerToExpend, Actionable.MODULATE, PowerMultiplier.CONFIG);
-        return (long) PowerMultiplier.CONFIG.divide(powerToExpend);
+        var availablePower = source.extractAEPower(maxAmount, Actionable.SIMULATE, PowerMultiplier.CONFIG);
+        source.extractAEPower(Math.min(maxAmount, availablePower), Actionable.MODULATE, PowerMultiplier.CONFIG);
+        return (double) maxAmount <= availablePower ? maxAmount : (long) availablePower;
     }
 
     public int getHighestTier() {