Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crashes from MindComponent trying to spawn ghosts on deleted grids.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-04-23 16:04:41 +02:00
parent 32f66b6f9e
commit d1a672ba32
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Content.Server/GameObjects/Components/Mobs/MindComponent.cs
View File

@@ -1,10 +1,14 @@
using Content.Server.GameObjects.Components.Observer; using Content.Server.GameObjects.Components.Observer;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs; using Content.Server.Mobs;
using Content.Server.Players; using Content.Server.Players;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Map;
using Robust.Shared.IoC;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers;
using Robust.Shared.Utility; using Robust.Shared.Utility;
using Robust.Shared.ViewVariables; using Robust.Shared.ViewVariables;
@@ -81,12 +85,24 @@ namespace Content.Server.GameObjects.Components.Mobs
} }
else else
{ {
var ghost = Owner.EntityManager.SpawnEntity("MobObserver", Owner.Transform.GridPosition); var spawnPosition = Owner.Transform.GridPosition;
ghost.Name = Mind.CharacterName; Timer.Spawn(0, () =>
{
// Async this so that we don't throw if the grid we're on is being deleted.
var mapMan = IoCManager.Resolve<IMapManager>();
var ghostComponent = ghost.GetComponent<GhostComponent>(); if (!mapMan.GridExists(spawnPosition.GridID))
ghostComponent.CanReturnToBody = false; {
Mind.TransferTo(ghost); spawnPosition = IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint();
}
var ghost = Owner.EntityManager.SpawnEntity("MobObserver", spawnPosition);
ghost.Name = Mind.CharacterName;
var ghostComponent = ghost.GetComponent<GhostComponent>();
ghostComponent.CanReturnToBody = false;
Mind.TransferTo(ghost);
});
} }
} }
} }