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

Fix exceptions on round restarts due to accessing deleted entities' components

Browse Source
This commit is contained in:
Víctor Aguilera Puerto
2020-06-07 15:32:38 +02:00
parent 5abd2e23f5
commit b8338bc64c
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameObjects/Components/Markers/ConditionalSpawnerComponent.cs
View File

@@ -91,7 +91,8 @@ namespace Content.Server.GameObjects.Components.Markers
return;
}
_entityManager.SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.GridPosition);
if(!Owner.Deleted)
_entityManager.SpawnEntity(_robustRandom.Pick(Prototypes), Owner.Transform.GridPosition);
}
public void MapInit()

5
Content.Server/GameObjects/Components/Power/PowerDevice.cs
View File

@@ -286,7 +286,7 @@ namespace Content.Server.GameObjects.Components.Power
private void ConnectToBestProvider()
{
//Any values we can connect to or are we already connected to a node, cancel!
if (!AvailableProviders.Any() || Connected == DrawTypes.Node || Deleted)
if (!AvailableProviders.Any() || Connected == DrawTypes.Node || Deleted || Owner.Deleted)
return;
//Get the starting value for our loop
@@ -300,6 +300,9 @@ namespace Content.Server.GameObjects.Components.Power
foreach (var availprovider in AvailableProviders)
{
if (availprovider.Owner.Deleted)
continue;
//Find distance to new provider
var distance = (availprovider.Owner.GetComponent<ITransformComponent>().WorldPosition - position).LengthSquared;