tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes a few deletes queued. (#4015)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-17 13:14:28 +02:00
committed by GitHub
parent 35521782a5
commit 92b01d6a7c
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/GameObjects/Components/Body/BodyComponent.cs
View File

@@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Body
} }
} }
Owner.Delete(); Owner.QueueDelete();
} }
} }
} }

2
Content.Server/GameObjects/Components/Chemistry/VaporComponent.cs
View File

@@ -125,7 +125,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
// Check for collision with a impassable object (e.g. wall) and stop // Check for collision with a impassable object (e.g. wall) and stop
if ((otherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && otherFixture.Hard) if ((otherFixture.CollisionLayer & (int) CollisionGroup.Impassable) != 0 && otherFixture.Hard)
{ {
Owner.Delete(); Owner.QueueDelete();
} }
} }
} }

2
Content.Server/GameObjects/Components/Explosion/ExplosiveComponent.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.GameObjects.Components.Explosion
{ {
Exploding = true; Exploding = true;
Owner.SpawnExplosion(DevastationRange, HeavyImpactRange, LightImpactRange, FlashRange); Owner.SpawnExplosion(DevastationRange, HeavyImpactRange, LightImpactRange, FlashRange);
Owner.Delete(); Owner.QueueDelete();
return true; return true;
} }
} }

2
Content.Server/GameObjects/Components/PA/ParticleProjectileComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.PA
_ => 0 _ => 0
}; };
singularityComponent.Energy += 10 * multiplier; singularityComponent.Energy += 10 * multiplier;
Owner.Delete(); Owner.QueueDelete();
} }
else if (otherFixture.Body.Owner.TryGetComponent<SingularityGeneratorComponent>(out var singularityGeneratorComponent)) else if (otherFixture.Body.Owner.TryGetComponent<SingularityGeneratorComponent>(out var singularityGeneratorComponent))
{ {

2
Content.Server/GameObjects/Components/Projectiles/ProjectileComponent.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
} }
if(DeleteOnCollide) if(DeleteOnCollide)
Owner.Delete(); Owner.QueueDelete();
} }
public override ComponentState GetComponentState(ICommonSession player) public override ComponentState GetComponentState(ICommonSession player)

2
Content.Server/GameObjects/Components/Singularity/ContainmentFieldComponent.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.GameObjects.Components.Singularity
{ {
if (Parent == null) if (Parent == null)
{ {
Owner.Delete(); Owner.QueueDelete();
return; return;
} }

2
Content.Server/GameObjects/Components/Singularity/ServerSingularityComponent.cs
View File

@@ -144,7 +144,7 @@ namespace Content.Server.GameObjects.Components.Singularity
if (otherEntity.IsInContainer()) if (otherEntity.IsInContainer())
return; return;
otherEntity.Delete(); otherEntity.QueueDelete();
Energy++; Energy++;
} }