Make sure that we don't accidentally reset a dead spawn to be reloadi…

…ng if it as killed by Limbo()
Vinifera-Developers · Feb 22, 2025 · 804ab08 · 804ab08
1 parent 534e5ae
commit 804ab08
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/new/spawnmanager/spawnmanager.cpp b/src/new/spawnmanager/spawnmanager.cpp
@@ -535,9 +535,13 @@ void SpawnManagerClass::AI()
 
                 if (owner_coord == spawnee_coord && std::abs(spawnee->Coord.Z - Owner->Coord.Z) < 20)
                 {
-                    spawnee->Limbo();
+                    /**
+                     *  Limbo() can destroy the unit in certain situations, and we don't want to affect the status if the spawnee
+                     *  was blown up (Detach() sets it to Dead). Do not touch the order of the statements here or all hell breaks loose.
+                     */
                     control->Status = SpawnControlStatus::Reloading;
                     control->ReloadTimer = ReloadRate;
+                    spawnee->Limbo();
                 }
                 else
                 {