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

Fix aghost (#272)

Browse Source
This commit is contained in:
Aviu00
2023-08-05 20:13:27 +03:00
committed by Aviu00
parent 0c098d9c53
commit cf2e80e2d5
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Administration/Commands/AGhost.cs
View File

@@ -3,6 +3,7 @@ using Content.Shared.Administration;
using Content.Shared.Ghost; using Content.Shared.Ghost;
using Content.Shared.Mind; using Content.Shared.Mind;
using Robust.Shared.Console; using Robust.Shared.Console;
using Robust.Shared.Map;
namespace Content.Server.Administration.Commands namespace Content.Server.Administration.Commands
{ {
@@ -33,6 +34,10 @@ namespace Content.Server.Administration.Commands
var metaDataSystem = _entities.System<MetaDataSystem>(); var metaDataSystem = _entities.System<MetaDataSystem>();
EntityCoordinates? coordinates = null;
if (player.AttachedEntity != null)
coordinates = _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates;
if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent)) if (mind.VisitingEntity != default && _entities.TryGetComponent<GhostComponent>(mind.VisitingEntity, out var oldGhostComponent))
{ {
mindSystem.UnVisit(mindId, mind); mindSystem.UnVisit(mindId, mind);
@@ -43,10 +48,10 @@ namespace Content.Server.Administration.Commands
var canReturn = mind.CurrentEntity != null var canReturn = mind.CurrentEntity != null
&& !_entities.HasComponent<GhostComponent>(mind.CurrentEntity); && !_entities.HasComponent<GhostComponent>(mind.CurrentEntity);
var coordinates = player.AttachedEntity != null coordinates ??= player.AttachedEntity != null
? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates ? _entities.GetComponent<TransformComponent>(player.AttachedEntity.Value).Coordinates
: EntitySystem.Get<GameTicker>().GetObserverSpawnPoint(); : EntitySystem.Get<GameTicker>().GetObserverSpawnPoint();
var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates); var ghost = _entities.SpawnEntity(GameTicker.AdminObserverPrototypeName, coordinates.Value);
_entities.GetComponent<TransformComponent>(ghost).AttachToGridOrMap(); _entities.GetComponent<TransformComponent>(ghost).AttachToGridOrMap();
if (canReturn) if (canReturn)