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

Cleanup matches on shutdown (#5724)

Browse Source
This commit is contained in:
metalgearsloth
2021-12-13 15:22:08 +11:00
committed by GitHub
parent c1972f7b3f
commit e277122237
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Light/EntitySystems/MatchstickSystem.cs
View File

@@ -24,6 +24,12 @@ namespace Content.Server.Light.EntitySystems
base.Initialize(); base.Initialize();
SubscribeLocalEvent<MatchstickComponent, InteractUsingEvent>(OnInteractUsing); SubscribeLocalEvent<MatchstickComponent, InteractUsingEvent>(OnInteractUsing);
SubscribeLocalEvent<MatchstickComponent, IsHotEvent>(OnIsHotEvent); SubscribeLocalEvent<MatchstickComponent, IsHotEvent>(OnIsHotEvent);
SubscribeLocalEvent<MatchstickComponent, ComponentShutdown>(OnShutdown);
}
private void OnShutdown(EntityUid uid, MatchstickComponent component, ComponentShutdown args)
{
_litMatches.Remove(component);
} }
public override void Update(float frameTime) public override void Update(float frameTime)
@@ -31,7 +37,7 @@ namespace Content.Server.Light.EntitySystems
base.Update(frameTime); base.Update(frameTime);
foreach (var match in _litMatches) foreach (var match in _litMatches)
{ {
if (match.CurrentState != SmokableState.Lit) if (match.CurrentState != SmokableState.Lit || match.Paused || match.Deleted)
continue; continue;
_atmosphereSystem.HotspotExpose(EntityManager.GetComponent<TransformComponent>(match.Owner).Coordinates, 400, 50, true); _atmosphereSystem.HotspotExpose(EntityManager.GetComponent<TransformComponent>(match.Owner).Coordinates, 400, 50, true);