bugfix: Abort AIExitState if the containing object dies

Author: Stubbjax

Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp

@@ -6272,7 +6272,12 @@ StateReturnType AIExitState::update()
 		//GS.  The goal of unified ExitInterfaces dies a horrible death.  I can't ask Object for the exit,
 		// as removeFromContain is only in the Contain type.  I'm splitting the names in shame.
 		ExitInterface* goalExitInterface = goal->getContain() ? goal->getContain()->getContainExitInterface() : nullptr;
+#if RETAIL_COMPATIBLE_CRC
 		if( goalExitInterface == nullptr )
+#else
+		// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
+		if (goalExitInterface == nullptr || goal->isEffectivelyDead())
+#endif
 			return STATE_FAILURE;
 
 		if( goalExitInterface->isExitBusy() )

Generals/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp

@@ -460,7 +460,7 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	// TheSuperHackers @bugfix Stubbjax 02/03/2026 If our parent container is held, then we
 	// are not free to exit.
 	DEBUG_ASSERTCRASH(specificObject->getContainedBy(), ("rider must be contained"));
-	if (specificObject->getContainedBy() && specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
+	if (specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
 		return FALSE;
 #endif
 

GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp

@@ -6484,7 +6484,12 @@ StateReturnType AIExitState::update()
 		//GS.  The goal of unified ExitInterfaces dies a horrible death.  I can't ask Object for the exit,
 		// as removeFromContain is only in the Contain type.  I'm splitting the names in shame.
 		ExitInterface* goalExitInterface = goal->getContain() ? goal->getContain()->getContainExitInterface() : nullptr;
+#if RETAIL_COMPATIBLE_CRC
 		if( goalExitInterface == nullptr )
+#else
+		// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
+		if (goalExitInterface == nullptr || goal->isEffectivelyDead())
+#endif
 			return STATE_FAILURE;
 
 		if( goalExitInterface->isExitBusy() )

GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain/TransportContain.cpp

@@ -571,7 +571,7 @@ Bool TransportContain::isSpecificRiderFreeToExit(Object* specificObject)
 	// TheSuperHackers @bugfix Stubbjax 02/03/2026 If our parent container is held, then we
 	// are not free to exit.
 	DEBUG_ASSERTCRASH(specificObject->getContainedBy(), ("rider must be contained"));
-	if (specificObject->getContainedBy() && specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
+	if (specificObject->getContainedBy()->isDisabledByType(DISABLED_HELD))
 		return FALSE;
 #endif