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

Makes more things queue delete to prevent physics collision callback issues.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-26 18:43:12 +02:00
parent 2232dbd71d
commit f64433a14d
14 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Client/GameObjects/EntitySystems/ConstructionSystem.cs
View File

@@ -184,7 +184,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
if (_ghosts.TryGetValue(ghostId, out var ghost))
{
ghost.Owner.Delete();
ghost.Owner.QueueDelete();
_ghosts.Remove(ghostId);
}
}
@@ -196,7 +196,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
foreach (var (_, ghost) in _ghosts)
{
ghost.Owner.Delete();
ghost.Owner.QueueDelete();
}
_ghosts.Clear();

2
Content.Server/Chemistry/ReactionEffects/AreaReactionEffect.cs
View File

@@ -129,7 +129,7 @@ namespace Content.Server.Chemistry.ReactionEffects
if (areaEffectComponent == null)
{
Logger.Error("Couldn't get AreaEffectComponent from " + _prototypeId);
ent.Delete();
ent.QueueDelete();
return;
}

2
Content.Server/Chemistry/TileReactions/CleanTileReaction.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.Chemistry.TileReactions
break;
amount = next;
entity.Delete();
entity.QueueDelete();
}
}

2
Content.Server/Construction/Completions/DeleteEntitiesInContainer.cs
View File

@@ -22,7 +22,7 @@ namespace Content.Server.Construction.Completions
foreach (var contained in container.ContainedEntities.ToArray())
{
if(container.Remove(contained))
contained.Delete();
contained.QueueDelete();
}
}
}

4
Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
View File

@@ -269,7 +269,7 @@ namespace Content.Server.GameObjects.Components.Atmos
Owner.SpawnExplosion((int) (range * 0.25f), (int) (range * 0.5f), (int) (range * 1.5f), 1);
Owner.Delete();
Owner.QueueDelete();
return;
}
@@ -283,7 +283,7 @@ namespace Content.Server.GameObjects.Components.Atmos
SoundSystem.Play(Filter.Pvs(Owner), "Audio/Effects/spray.ogg", Owner.Transform.Coordinates,
AudioHelpers.WithVariation(0.125f));
Owner.Delete();
Owner.QueueDelete();
return;
}

2
Content.Server/GameObjects/Components/Botany/LogComponent.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components.Botany
plank.RandomOffset(0.25f);
}
Owner.Delete();
Owner.QueueDelete();
return true;
}

6
Content.Server/GameObjects/Components/Botany/PlantHolderComponent.cs
View File

@@ -655,7 +655,7 @@ namespace Content.Server.GameObjects.Components.Botany
if (seeds.Seed == null)
{
user.PopupMessageCursor(Loc.GetString("The packet seems to be empty. You throw it away."));
usingItem.Delete();
usingItem.QueueDelete();
return false;
}
@@ -667,7 +667,7 @@ namespace Content.Server.GameObjects.Components.Botany
Health = Seed.Endurance;
_lastCycle = _gameTiming.CurTime;
usingItem.Delete();
usingItem.QueueDelete();
CheckLevelSanity();
UpdateSprite();
@@ -799,7 +799,7 @@ namespace Content.Server.GameObjects.Components.Botany
ForceUpdateByExternalCause();
}
usingItem.Delete();
usingItem.QueueDelete();
return true;
}

2
Content.Server/GameObjects/Components/Botany/SeedExtractorComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Server.GameObjects.Components.Botany
{
eventArgs.User.PopupMessageCursor(Loc.GetString("You extract some seeds from the {0}.", eventArgs.Using.Name));
eventArgs.Using.Delete();
eventArgs.Using.QueueDelete();
var random = _random.Next(_minSeeds, _maxSeeds);

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

@@ -75,7 +75,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
{
Owner.EntityManager.SpawnEntity(_foamedMetalPrototype, Owner.Transform.Coordinates);
}
Owner.Delete();
Owner.QueueDelete();
});
}
}

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

@@ -108,7 +108,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
trueTarget.PopupMessage(user, Loc.GetString("You swallow the pill."));
Owner.Delete();
Owner.QueueDelete();
return true;
}
}

2
Content.Server/GameObjects/Components/Nutrition/CreamPieComponent.cs
View File

@@ -44,7 +44,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
solution.Solution.SpillAt(Owner, "PuddleSmear", false);
}
Owner.Delete();
Owner.QueueDelete();
}
}
}

2
Content.Server/GameObjects/Components/Recycling/RecyclableComponent.cs
View File

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

2
Content.Server/GameObjects/EntitySystems/PuddleSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.GameObjects.EntitySystems
grid.TileIndicesFor(puddleTransform.Coordinates) == eventArgs.NewTile.GridIndices &&
eventArgs.NewTile.Tile.IsEmpty)
{
puddle.Owner.Delete();
puddle.Owner.QueueDelete();
break; // Currently it's one puddle per tile, if that changes remove this
}
}

2
Content.Shared/GameObjects/EntitySystems/ActSystem.cs
View File

@@ -68,7 +68,7 @@ namespace Content.Shared.GameObjects.EntitySystems
destroyAct.OnDestroy(eventArgs);
}
owner.Delete();
owner.QueueDelete();
}
public void HandleExplosion(EntityCoordinates source, IEntity target, ExplosionSeverity severity)