From afc8d5e396b234f8a12b3b3a5c739b65b8a5be0e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 15 Jul 2024 10:45:32 -0400
Subject: [PATCH] Possible stack conveyor freeze fix (3)

---
 .../mindustry/world/blocks/distribution/StackConveyor.java   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/world/blocks/distribution/StackConveyor.java b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
index f79496af93..9bf0bcf4cf 100644
--- a/core/src/mindustry/world/blocks/distribution/StackConveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/StackConveyor.java
@@ -280,14 +280,15 @@ public class StackConveyor extends Block implements Autotiler{
             if(!enabled) return;
 
             if(state == stateUnload){ //unload
-                while(lastItem != null && items.has(lastItem) && !outputRouter ? moveForward(lastItem) : dump(lastItem)){
+                while(lastItem != null && !outputRouter ? moveForward(lastItem) : dump(lastItem)){
                     if(!outputRouter){
                         items.remove(lastItem, 1);
                     }
 
-                    if(items.empty()){
+                    if(!items.has(lastItem)){
                         poofOut();
                         lastItem = null;
+                        break;
                     }
                 }
             }else{ //transfer