Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 13 additions & 2 deletions Core/GameEngine/Source/GameClient/System/ParticleSys.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2125,9 +2125,15 @@ Bool ParticleSystem::update( Int localPlayerIndex )
// If we have been "destroyed", wait for all of our particles to die off,
// then destroy ourselves (return false).
//
// TheSuperHackers @bugfix Mauller 30/08/2026 Delay destruction to prevent finite-lifetime slave particle systems being orphaned.
// Orphaned particle systems lack positional data, render at the world origin and do not complete their full lifecycle.
if (m_isDestroyed && !m_systemParticlesHead)
return false;
{
if (m_slaveSystem && !m_slaveSystem->isSystemForever())
Comment thread
greptile-apps[bot] marked this conversation as resolved.
Comment thread
xezon marked this conversation as resolved.
return true;

return false;
}

// monitor particle system lifetime
if (m_isForever == false)
Expand All @@ -2142,7 +2148,12 @@ Bool ParticleSystem::update( Int localPlayerIndex )

// check if time is up
if (m_systemLifetimeLeft == 0)
Comment thread
xezon marked this conversation as resolved.
return false;
{
if (m_slaveSystem && !m_slaveSystem->isSystemForever())
m_isDestroyed = true;
else
return false;
}
}

return true;
Expand Down
Loading