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

Fix the last of the compiler warnings.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-10-22 10:26:24 +02:00
parent e98abd923c
commit f61aeb19e5
5 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Content.Server/GameObjects/Components/Weapon/Ranged/Ammunition/AmmoComponent.cs
View File

@@ -26,7 +26,6 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Ammunition
public class AmmoComponent : Component, IExamine public class AmmoComponent : Component, IExamine
{ {
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IEntityManager _entityManager = default!;
public override string Name => "Ammo"; public override string Name => "Ammo";
public BallisticCaliber Caliber => _caliber; public BallisticCaliber Caliber => _caliber;

6
Content.Server/GameObjects/EntitySystems/BatteryDischargerSystem.cs
View File

@@ -9,17 +9,15 @@ namespace Content.Server.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class BatteryDischargerSystem : EntitySystem internal sealed class BatteryDischargerSystem : EntitySystem
{ {
[Dependency] private readonly IPauseManager _pauseManager = default!;
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
foreach (var comp in ComponentManager.EntityQuery<BatteryDischargerComponent>()) foreach (var comp in ComponentManager.EntityQuery<BatteryDischargerComponent>())
{ {
if (_pauseManager.IsEntityPaused(comp.Owner)) if (comp.Owner.Paused)
{ {
continue; continue;
} }
comp.Update(frameTime); comp.Update(frameTime);
} }
} }

6
Content.Server/GameObjects/EntitySystems/BatteryStorageSystem.cs
View File

@@ -9,17 +9,15 @@ namespace Content.Server.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class BatteryStorageSystem : EntitySystem internal sealed class BatteryStorageSystem : EntitySystem
{ {
[Dependency] private readonly IPauseManager _pauseManager = default!;
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
foreach (var comp in ComponentManager.EntityQuery<BatteryStorageComponent>()) foreach (var comp in ComponentManager.EntityQuery<BatteryStorageComponent>())
{ {
if (_pauseManager.IsEntityPaused(comp.Owner)) if (comp.Owner.Paused)
{ {
continue; continue;
} }
comp.Update(frameTime); comp.Update(frameTime);
} }
} }

1
Content.Server/GameObjects/EntitySystems/MoverSystem.cs
View File

@@ -31,7 +31,6 @@ namespace Content.Server.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal class MoverSystem : SharedMoverSystem internal class MoverSystem : SharedMoverSystem
{ {
[Dependency] private readonly IPauseManager _pauseManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!;
[Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IMapManager _mapManager = default!;

8
Content.Server/GameObjects/EntitySystems/PowerApcSystem.cs
View File

@@ -11,14 +11,12 @@ namespace Content.Server.GameObjects.EntitySystems
[UsedImplicitly] [UsedImplicitly]
internal sealed class PowerApcSystem : EntitySystem internal sealed class PowerApcSystem : EntitySystem
{ {
[Dependency] private readonly IPauseManager _pauseManager = default!;
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
var uniqueApcNets = new HashSet<IApcNet>(); //could be improved by maintaining set instead of getting collection every frame var uniqueApcNets = new HashSet<IApcNet>(); //could be improved by maintaining set instead of getting collection every frame
foreach (var apc in ComponentManager.EntityQuery<ApcComponent>()) foreach (var apc in ComponentManager.EntityQuery<ApcComponent>())
{ {
if (_pauseManager.IsEntityPaused(apc.Owner)) if (apc.Owner.Paused)
{ {
continue; continue;
} }
@@ -26,7 +24,7 @@ namespace Content.Server.GameObjects.EntitySystems
uniqueApcNets.Add(apc.Net); uniqueApcNets.Add(apc.Net);
apc.Update(); apc.Update();
} }
foreach (var apcNet in uniqueApcNets) foreach (var apcNet in uniqueApcNets)
{ {
apcNet.Update(frameTime); apcNet.Update(frameTime);