Fix server deadlock caused by lossy division operations

62832 · May 8, 2024 · c950dde · c950dde
1 parent c0916bb
commit c950dde
Showing 1 changed file with 11 additions and 4 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
@@ -104,8 +104,8 @@ public long extract(AEKey what, long amount, Actionable mode, IActionSource sour
         var providers = new ArrayList<IKnowledgeProvider>();
 
         if (source.player().isPresent() && AppliedEConfig.CONFIG.terminalExtractFromOwnEmcOnly()) {
-            providers.add(
-                    service.getProviderFor(source.player().get().getUUID()).get());
+            var provider = service.getProviderFor(source.player().get().getUUID());
+            providers.add(provider.get());
         } else {
             providers.addAll(service.getProviders());
         }
@@ -117,6 +117,7 @@ public long extract(AEKey what, long amount, Actionable mode, IActionSource sour
             var divisor = BigInteger.valueOf(service.getProviders().size());
             var quotient = toExtract.divide(divisor);
             var remainder = toExtract.remainder(divisor).longValue();
+            var lastExtracted = 0L;
 
             for (var p = 0; p < providers.size(); p++) {
                 var provider = providers.get(p);
@@ -129,15 +130,21 @@ public long extract(AEKey what, long amount, Actionable mode, IActionSource sour
                         provider.setEmc(BigInteger.ZERO);
                     }
 
-                    extracted += currentEmc.divide(multiplier).longValue();
+                    lastExtracted = currentEmc.divide(multiplier).longValue();
+                    extracted += lastExtracted;
                     // provider exhausted, remove from current list to re-extract deficit from remaining providers
                     providers.remove(provider);
                 } else {
                     if (mode == Actionable.MODULATE) {
                         provider.setEmc(currentEmc.subtract(toExtractFrom));
                     }
 
-                    extracted += toExtractFrom.divide(multiplier).longValue();
+                    lastExtracted = toExtractFrom.divide(multiplier).longValue();
+                    extracted += lastExtracted;
+                }
+
+                if (lastExtracted == 0) {
+                    providers.remove(provider);
                 }
             }
         }