diff --git a/Content.Server/GameObjects/Components/Body/BodyComponent.cs b/Content.Server/GameObjects/Components/Body/BodyComponent.cs index 3dc6ecb032..974148a731 100644 --- a/Content.Server/GameObjects/Components/Body/BodyComponent.cs +++ b/Content.Server/GameObjects/Components/Body/BodyComponent.cs @@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Body } } - Owner.Delete(); + Owner.QueueDelete(); } } } diff --git a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs index 11dec4f2f3..9ffd0b3a60 100644 --- a/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs @@ -125,7 +125,7 @@ namespace Content.Server.GameObjects.Components.Chemistry // Check for collision with a impassable object (e.g. wall) and stop if ((otherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && otherFixture.Hard) { - Owner.Delete(); + Owner.QueueDelete(); } } } diff --git a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs index 9c24f370e1..6c7fa0900f 100644 --- a/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs +++ b/Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs @@ -34,7 +34,7 @@ namespace Content.Server.GameObjects.Components.Explosion { Exploding = true; Owner.SpawnExplosion(DevastationRange, HeavyImpactRange, LightImpactRange, FlashRange); - Owner.Delete(); + Owner.QueueDelete(); return true; } } diff --git a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs index 61e3e92497..f67af768dc 100644 --- a/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs @@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.PA _ => 0 }; singularityComponent.Energy += 10 * multiplier; - Owner.Delete(); + Owner.QueueDelete(); } else if (otherFixture.Body.Owner.TryGetComponent(out var singularityGeneratorComponent)) { diff --git a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs index 4ffa9a1038..db5f6bb54d 100644 --- a/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs +++ b/Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs @@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Projectiles } if(DeleteOnCollide) - Owner.Delete(); + Owner.QueueDelete(); } public override ComponentState GetComponentState(ICommonSession player) diff --git a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs index 96d9df2b10..cf496c7b9e 100644 --- a/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs @@ -16,7 +16,7 @@ namespace Content.Server.GameObjects.Components.Singularity { if (Parent == null) { - Owner.Delete(); + Owner.QueueDelete(); return; } diff --git a/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs b/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs index 6572168619..085c7a2a83 100644 --- a/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs +++ b/Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs @@ -144,7 +144,7 @@ namespace Content.Server.GameObjects.Components.Singularity if (otherEntity.IsInContainer()) return; - otherEntity.Delete(); + otherEntity.QueueDelete(); Energy++; }