Skip to content

bugfix(contain): Ensure container exists when checking if a specific rider is free to exit #2513

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Stubbjax wants to merge 3 commits into
base: main
Choose a base branch
from
+12 −0
Open

bugfix(contain): Ensure container exists when checking if a specific rider is free to exit #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb9b2c
fix: Ensure container exists when checking if a specific rider is fre…
Stubbjax Mar 31, 2026
206aaec
bugfix: Abort AIExitState if the containing object dies
Stubbjax May 3, 2026
90b207d
refactor: Convert fix into a standalone block
Stubbjax May 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Generals/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6275,6 +6275,12 @@ StateReturnType AIExitState::update()
if( goalExitInterface == nullptr )
return STATE_FAILURE;

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
if (goal->isEffectivelyDead())
return STATE_FAILURE;
#endif

if( goalExitInterface->isExitBusy() )
return STATE_CONTINUE;// Just wait a sec.

Expand Down
6 changes: 6 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameLogic/AI/AIStates.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6487,6 +6487,12 @@ StateReturnType AIExitState::update()
if( goalExitInterface == nullptr )
return STATE_FAILURE;

#if !RETAIL_COMPATIBLE_CRC
// TheSuperHackers @bugfix Stubbjax 03/05/2026 Stop trying to exit if the container is dead, as we are already ejected.
if (goal->isEffectivelyDead())
return STATE_FAILURE;
#endif

if( goalExitInterface->isExitBusy() )
return STATE_CONTINUE;// Just wait a sec.

Expand Down
Loading