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

Fix gas analyser error. (#11386)

Browse Source
This commit is contained in:
Leon Friedrich
2022-09-18 11:10:10 +12:00
committed by GitHub
parent 49e1b7d4dc
commit 42f080d665
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Server.Atmos; using Content.Server.Atmos;
using Content.Server.Atmos.Components; using Content.Server.Atmos.Components;
using Content.Server.NodeContainer; using Content.Server.NodeContainer;
using Content.Server.NodeContainer.Nodes; using Content.Server.NodeContainer.Nodes;
@@ -87,7 +87,7 @@ namespace Content.Server.Atmos.EntitySystems
UpdateAppearance(component); UpdateAppearance(component);
if(!HasComp<ActiveGasAnalyzerComponent>(uid)) if(!HasComp<ActiveGasAnalyzerComponent>(uid))
AddComp<ActiveGasAnalyzerComponent>(uid); AddComp<ActiveGasAnalyzerComponent>(uid);
UpdateAnalyzer(uid); UpdateAnalyzer(uid, component);
} }
/// <summary> /// <summary>
@@ -143,8 +143,14 @@ namespace Content.Server.Atmos.EntitySystems
if (!Resolve(uid, ref component)) if (!Resolve(uid, ref component))
return false; return false;
if (!TryComp(component.User, out TransformComponent? xform))
{
DisableAnalyzer(uid, component);
return false;
}
// check if the user has walked away from what they scanned // check if the user has walked away from what they scanned
var userPos = Transform(component.User).Coordinates; var userPos = xform.Coordinates;
if (component.LastPosition.HasValue) if (component.LastPosition.HasValue)
{ {
// Check if position is out of range => don't update and disable // Check if position is out of range => don't update and disable
@@ -175,6 +181,13 @@ namespace Content.Server.Atmos.EntitySystems
var deviceFlipped = false; var deviceFlipped = false;
if (component.Target != null) if (component.Target != null)
{ {
if (Deleted(component.Target))
{
component.Target = null;
DisableAnalyzer(uid, component, component.User);
return false;
}
// gas analyzed was used on an entity, try to request gas data via event for override // gas analyzed was used on an entity, try to request gas data via event for override
var ev = new GasAnalyzerScanEvent(); var ev = new GasAnalyzerScanEvent();
RaiseLocalEvent(component.Target.Value, ev, false); RaiseLocalEvent(component.Target.Value, ev, false);