diff --git a/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs b/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs index ea0cb7518e..c853287fd6 100644 --- a/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs +++ b/Content.Shared/MobState/EntitySystems/SharedMobStateSystem.cs @@ -302,6 +302,10 @@ namespace Content.Shared.MobState.EntitySystems /// private void SetMobState(MobStateComponent component, DamageState? old, (DamageState state, FixedPoint2 threshold)? current, EntityUid? origin = null) { + //if it got deleted instantly in a nuke or something + if (!Exists(component.Owner) || Deleted(component.Owner)) + return; + if (!current.HasValue) { ExitState(component, old);