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

Revert "Welders now use EntityQuery to update instead of subscriptions."

Browse Source 
This reverts commit a815b50f6d and fixes the issue properly.
This commit is contained in:
Víctor Aguilera Puerto
2020-08-15 00:12:30 +02:00
parent a815b50f6d
commit b2709733a5
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/GameObjects/Components/Interactable/WelderComponent.cs
View File

@@ -162,6 +162,7 @@ namespace Content.Server.GameObjects.Components.Interactable
if (_pointLightComponent != null) _pointLightComponent.Enabled = false; if (_pointLightComponent != null) _pointLightComponent.Enabled = false;
PlaySoundCollection("WelderOff", -5); PlaySoundCollection("WelderOff", -5);
_welderSystem.Unsubscribe(this);
return true; return true;
} }
@@ -178,6 +179,7 @@ namespace Content.Server.GameObjects.Components.Interactable
if (_pointLightComponent != null) _pointLightComponent.Enabled = true; if (_pointLightComponent != null) _pointLightComponent.Enabled = true;
PlaySoundCollection("WelderOn", -5); PlaySoundCollection("WelderOn", -5);
_welderSystem.Subscribe(this);
Owner.Transform.GridPosition Owner.Transform.GridPosition
.GetTileAtmosphere()?.HotspotExpose(700f, 50f, true); .GetTileAtmosphere()?.HotspotExpose(700f, 50f, true);
@@ -208,9 +210,15 @@ namespace Content.Server.GameObjects.Components.Interactable
} }
} }
protected override void Shutdown()
{
base.Shutdown();
_welderSystem.Unsubscribe(this);
}
public void OnUpdate(float frameTime) public void OnUpdate(float frameTime)
{ {
if (!HasQuality(ToolQuality.Welding) || !WelderLit) if (!HasQuality(ToolQuality.Welding) || !WelderLit || Owner.Deleted)
return; return;
_solutionComponent?.TryRemoveReagent("chem.WeldingFuel", ReagentUnit.New(FuelLossRate * frameTime)); _solutionComponent?.TryRemoveReagent("chem.WeldingFuel", ReagentUnit.New(FuelLossRate * frameTime));

18
Content.Server/GameObjects/EntitySystems/WelderSystem.cs
View File

@@ -1,7 +1,6 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Server.GameObjects.Components.Interactable; using Content.Server.GameObjects.Components.Interactable;
using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Systems; using Robust.Shared.GameObjects.Systems;
namespace Content.Server.GameObjects.EntitySystems namespace Content.Server.GameObjects.EntitySystems
@@ -11,12 +10,23 @@ namespace Content.Server.GameObjects.EntitySystems
/// </summary> /// </summary>
public class WelderSystem : EntitySystem public class WelderSystem : EntitySystem
{ {
private readonly HashSet<WelderComponent> _activeWelders = new HashSet<WelderComponent>();
public bool Subscribe(WelderComponent welder)
{
return _activeWelders.Add(welder);
}
public bool Unsubscribe(WelderComponent welder)
{
return _activeWelders.Remove(welder);
}
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
foreach (var welder in EntityManager.ComponentManager.EntityQuery<WelderComponent>()) foreach (var tool in _activeWelders.ToArray())
{ {
if(welder.WelderLit && !welder.Owner.Deleted) tool.OnUpdate(frameTime);
welder.OnUpdate(frameTime);
} }
} }
} }