Fix #19: Transmuting items to/from EMC does not limit the amount of i…

…tems based on stored energy
62832 · Nov 11, 2024 · 0c3158d · 0c3158d
1 parent 7e66713
commit 0c3158d
Showing 1 changed file with 12 additions and 10 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
@@ -328,16 +328,18 @@ private long getAmountAfterPowerExpenditure(BigInteger maxEmc, BigInteger itemEm
 
         var available = energyService.extractAEPower(toExpend.doubleValue(), Actionable.SIMULATE, PowerMultiplier.ONE);
         var expended = Math.min(available, toExpend.doubleValue());
-        energyService.extractAEPower(expended, Actionable.MODULATE, PowerMultiplier.ONE);
-
-        return expended == available
-                ? maxEmc.divide(itemEmc).longValue()
-                : BigDecimal.valueOf(available)
-                        .min(toExpend)
-                        .divide(multiplier, RoundingMode.HALF_UP)
-                        .toBigInteger()
-                        .divide(itemEmc)
-                        .longValue();
+        var amount = BigDecimal.valueOf(available)
+                .min(toExpend)
+                .divide(multiplier, RoundingMode.HALF_UP)
+                .toBigInteger()
+                .divide(itemEmc)
+                .longValue();
+
+        if (amount > 0) {
+            energyService.extractAEPower(expended, Actionable.MODULATE, PowerMultiplier.ONE);
+        }
+
+        return amount;
     }
 
     private void addKnowledge(AEItemKey what, IKnowledgeProvider provider, Player player) {