Makes a few deletes queued. (#4015)
This commit is contained in:
committed by
GitHub
parent
35521782a5
commit
92b01d6a7c
@@ -120,7 +120,7 @@ namespace Content.Server.GameObjects.Components.Body
|
||||
}
|
||||
}
|
||||
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace Content.Server.GameObjects.Components.Explosion
|
||||
{
|
||||
Exploding = true;
|
||||
Owner.SpawnExplosion(DevastationRange, HeavyImpactRange, LightImpactRange, FlashRange);
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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<SingularityGeneratorComponent>(out var singularityGeneratorComponent))
|
||||
{
|
||||
|
||||
@@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components.Projectiles
|
||||
}
|
||||
|
||||
if(DeleteOnCollide)
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
}
|
||||
|
||||
public override ComponentState GetComponentState(ICommonSession player)
|
||||
|
||||
@@ -16,7 +16,7 @@ namespace Content.Server.GameObjects.Components.Singularity
|
||||
{
|
||||
if (Parent == null)
|
||||
{
|
||||
Owner.Delete();
|
||||
Owner.QueueDelete();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -144,7 +144,7 @@ namespace Content.Server.GameObjects.Components.Singularity
|
||||
if (otherEntity.IsInContainer())
|
||||
return;
|
||||
|
||||
otherEntity.Delete();
|
||||
otherEntity.QueueDelete();
|
||||
Energy++;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user