File tree Expand file tree Collapse file tree
GeneralsMD/Code/GameEngine/Source/GameLogic/Object/Contain
Generals/Code/GameEngine/Source/GameLogic/Object/Contain Expand file tree Collapse file tree Original file line number Diff line number Diff 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
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments