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

Fix station deletion bug (#10348)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-07 15:53:07 +12:00
committed by GitHub
parent 31141ad0fb
commit 099d38b562
5 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Singularity/EntitySystems/SingularitySystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Server.Ghost.Components;
using Content.Server.Singularity.Components;
using Content.Server.Station.Components;
using Content.Shared.Singularity;
using Content.Shared.Singularity.Components;
using JetBrains.Annotations;
@@ -130,6 +131,7 @@ namespace Content.Server.Singularity.EntitySystems
return entity != component.Owner &&
!EntityManager.HasComponent<IMapGridComponent>(entity) &&
!EntityManager.HasComponent<GhostComponent>(entity) &&
!EntityManager.HasComponent<StationDataComponent>(entity) && // these SHOULD be in null-space... but just in case. Also, maybe someone moves a singularity there..
(component.Level > 4 ||
!EntityManager.HasComponent<ContainmentFieldComponent>(entity) &&
!EntityManager.HasComponent<ContainmentFieldGeneratorComponent>(entity));