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

Fix exceptions from deleting pilot chair with player in it.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-05-23 22:51:41 +02:00
parent 36b5326a37
commit 82b7a09880
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,11 +2,11 @@
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameTicking; using Content.Server.Interfaces.GameTicking;
using Content.Server.Mobs; using Content.Server.Mobs;
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.Interfaces.Map;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Map;
using Robust.Shared.Serialization; using Robust.Shared.Serialization;
using Robust.Shared.Timers; using Robust.Shared.Timers;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -91,7 +91,7 @@ namespace Content.Server.GameObjects.Components.Mobs
// Async this so that we don't throw if the grid we're on is being deleted. // Async this so that we don't throw if the grid we're on is being deleted.
var mapMan = IoCManager.Resolve<IMapManager>(); var mapMan = IoCManager.Resolve<IMapManager>();
if (!mapMan.GridExists(spawnPosition.GridID)) if (spawnPosition.GridID == GridId.Invalid || !mapMan.GridExists(spawnPosition.GridID))
{ {
spawnPosition = IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint(); spawnPosition = IoCManager.Resolve<IGameTicker>().GetObserverSpawnPoint();
} }

4
Content.Server/GameObjects/Components/Movement/ShuttleControllerComponent.cs
View File

@@ -133,11 +133,11 @@ namespace Content.Server.GameObjects.Components.Movement
if (!removed) if (!removed)
{ {
mindComp.Mind.Visit(Owner); mindComp.Mind?.Visit(Owner);
} }
else else
{ {
mindComp.Mind.UnVisit(); mindComp.Mind?.UnVisit();
} }
} }
} }