Waiting status should not call preWorking/postWorking function

GregTechCEu · Apr 15, 2024 · fbdcbbf · fbdcbbf
1 parent 45da6c0
commit fbdcbbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
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
@@ -97,14 +97,14 @@ public void scheduleRenderUpdate() {
      * Call it to abort current recipe and reset the first state.
      */
     public void resetRecipeLogic() {
+        setStatus(Status.IDLE);
         recipeDirty = false;
         lastRecipe = null;
         lastOriginRecipe = null;
         progress = 0;
         duration = 0;
         fuelTime = 0;
         lastFailedMatches = null;
-        setStatus(Status.IDLE);
         updateTickSubscription();
     }
 
@@ -326,9 +326,9 @@ private void notifyRecipeStatusChanged(Status oldStatus, Status newStatus) {
         if (lastRecipe == null) {
             return;
         }
-        if (oldStatus == Status.WORKING && newStatus != Status.WORKING) {
+        if (oldStatus == Status.WORKING && newStatus != Status.WORKING && newStatus != Status.WAITING) {
             lastRecipe.postWorking(machine);
-        } else if (oldStatus != Status.WORKING && newStatus == Status.WORKING) {
+        } else if (oldStatus != Status.WAITING && oldStatus != Status.WORKING && newStatus == Status.WORKING) {
             lastRecipe.preWorking(machine);
         }
     }

diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/KineticPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/KineticPartMachine.java
@@ -2,6 +2,7 @@
 
 import com.gregtechceu.gtceu.api.capability.recipe.IO;
 import com.gregtechceu.gtceu.api.machine.IMachineBlockEntity;
+import com.gregtechceu.gtceu.api.machine.feature.multiblock.IWorkableMultiController;
 import com.gregtechceu.gtceu.api.machine.multiblock.part.TieredIOPartMachine;
 import com.gregtechceu.gtceu.common.machine.kinetic.IKineticMachine;
 import com.gregtechceu.gtceu.common.machine.trait.NotifiableStressTrait;
@@ -69,4 +70,11 @@ public void onRotated(Direction oldFacing, Direction newFacing) {
     public boolean shouldOpenUI(Player player, InteractionHand hand, BlockHitResult hit) {
         return false;
     }
+
+    @Override
+    public boolean onWaiting(IWorkableMultiController controller) {
+        getKineticHolder().stopWorking();
+        return super.onWaiting(controller);
+    }
+
 }