diff --git a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index d588bc3cf89..77fa2eba516 100644 --- a/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/Generals/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -476,7 +476,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj, // in the future) // Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() ); +#if RETAIL_COMPATIBLE_CRC if( builder ) +#else + // TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death. + if (builder && !builder->isEffectivelyDead()) +#endif { AIUpdateInterface *ai = builder->getAI(); DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") ); diff --git a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp index ee93d3a076b..fc344a6fc31 100644 --- a/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp +++ b/GeneralsMD/Code/GameEngine/Source/Common/RTS/ActionManager.cpp @@ -480,7 +480,12 @@ Bool ActionManager::canResumeConstructionOf( const Object *obj, // in the future) // Object *builder = TheGameLogic->findObjectByID( objectBeingConstructed->getBuilderID() ); +#if RETAIL_COMPATIBLE_CRC if( builder ) +#else + // TheSuperHackers @bugfix Stubbjax 18/11/2025 Allow scaffold to be immediately resumed after builder death. + if (builder && !builder->isEffectivelyDead()) +#endif { AIUpdateInterface *ai = builder->getAI(); DEBUG_ASSERTCRASH( ai, ("Builder object does not have an AI interface!") );