Skip to content

Commit fda1f98

Browse files
committed
tweak: Adjust fix to check destroyed status instead of dead status
1 parent 919e73d commit fda1f98

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ void OpenContain::addToContain( Object *rider )
280280
#else
281281
// TheSuperHackers @bugfix Stubbjax 06/02/2026 Always ensure interacting objects are alive.
282282
// This prevents undefined behaviour if a unit dies and enters a container on the same frame.
283-
if (rider == nullptr || (rider->isEffectivelyDead() && !rider->getBodyModule()->isIndestructible()) || getObject()->isEffectivelyDead())
283+
if (rider == nullptr || rider->isDestroyed() || getObject()->isDestroyed())
284284
return;
285285
#endif
286286

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ void OpenContain::addToContain( Object *rider )
298298

299299
// TheSuperHackers @bugfix Stubbjax 06/02/2026 Always ensure interacting objects are alive.
300300
// This prevents undefined behaviour if a unit dies and enters a container on the same frame.
301-
if (rider == nullptr || (rider->isEffectivelyDead() && !rider->getBodyModule()->isIndestructible()) || getObject()->isEffectivelyDead())
301+
if (rider == nullptr || rider->isDestroyed() || getObject()->isDestroyed())
302302
return;
303303
#endif
304304

0 commit comments

Comments
 (0)