Fix machines set to disable after current cycle not disabling on powerstall (#4215)

DilithiumThoride · web-flow · commit 05cf5e818484 · 2025-11-23T15:00:12.000+01:00
diff --git a/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java b/src/main/java/com/gregtechceu/gtceu/api/machine/trait/RecipeLogic.java
@@ -296,7 +296,6 @@ public void handleRecipeWorking() {
                         if (machine.self() instanceof IMultiController && !preventPowerFail) {
                             runAttempt = 0;
                             setStatus(Status.SUSPEND);
-                            regressRecipe();
                         }
                     }
                     runDelay = runAttempt * 60;
@@ -305,7 +304,7 @@ public void handleRecipeWorking() {
         } else {
             setWaiting(conditionResult.reason());
         }
-        if (isWaiting()) {
+        if (isWaiting() || isSuspend()) {
             regressRecipe();
         }
     }
@@ -394,7 +393,8 @@ public void setStatus(Status status) {
             if (this.status == Status.WORKING) {
                 this.totalContinuousRunningTime = 0;
             }
-            if (status == Status.SUSPEND && suspendAfterFinish) {
+            if ((status == Status.WAITING || status == Status.SUSPEND) && suspendAfterFinish) {
+                status = Status.SUSPEND;
                 suspendAfterFinish = false;
             }
             machine.notifyStatusChanged(this.status, status);

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,6 @@ public void handleRecipeWorking() {`
`296`	`296`	`if (machine.self() instanceof IMultiController && !preventPowerFail) {`
`297`	`297`	`runAttempt = 0;`
`298`	`298`	`setStatus(Status.SUSPEND);`
`299`		`- regressRecipe();`
`300`	`299`	`}`
`301`	`300`	`}`
`302`	`301`	`runDelay = runAttempt * 60;`
`@@ -305,7 +304,7 @@ public void handleRecipeWorking() {`
`305`	`304`	`} else {`
`306`	`305`	`setWaiting(conditionResult.reason());`
`307`	`306`	`}`
`308`		`- if (isWaiting()) {`
	`307`	`+ if (isWaiting() \|\| isSuspend()) {`
`309`	`308`	`regressRecipe();`
`310`	`309`	`}`
`311`	`310`	`}`
`@@ -394,7 +393,8 @@ public void setStatus(Status status) {`
`394`	`393`	`if (this.status == Status.WORKING) {`
`395`	`394`	`this.totalContinuousRunningTime = 0;`
`396`	`395`	`}`
`397`		`- if (status == Status.SUSPEND && suspendAfterFinish) {`
	`396`	`+ if ((status == Status.WAITING \|\| status == Status.SUSPEND) && suspendAfterFinish) {`
	`397`	`+ status = Status.SUSPEND;`
`398`	`398`	`suspendAfterFinish = false;`
`399`	`399`	`}`
`400`	`400`	`machine.notifyStatusChanged(this.status, status);`