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

Changes required for VirtualController EntitySystems (#6161)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2022-01-16 08:48:11 +01:00
committed by GitHub
parent e3be84b5f8
commit 748dfb2ecb
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Friction/TileFrictionController.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Client.Friction
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
Mover = EntitySystem.Get<SharedPhysicsSystem>().GetController<MoverController>(); Mover = Get<MoverController>();
} }
} }
} }

2
Content.Server/Friction/TileFrictionController.cs
View File

@@ -9,7 +9,7 @@ namespace Content.Server.Friction
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
Mover = EntitySystem.Get<SharedPhysicsSystem>().GetController<MoverController>(); Mover = Get<MoverController>();
} }
} }
} }

7
Content.Server/Physics/Controllers/ConveyorController.cs
View File

@@ -13,14 +13,13 @@ namespace Content.Server.Physics.Controllers
{ {
internal sealed class ConveyorController : VirtualController internal sealed class ConveyorController : VirtualController
{ {
private ConveyorSystem _conveyor = default!; [Dependency] private readonly ConveyorSystem _conveyor = default!;
public override List<Type> UpdatesAfter => new() {typeof(MoverController)};
public override void Initialize() public override void Initialize()
{ {
UpdatesAfter.Add(typeof(MoverController));
base.Initialize(); base.Initialize();
_conveyor = EntitySystem.Get<ConveyorSystem>();
} }
public override void UpdateBeforeSolve(bool prediction, float frameTime) public override void UpdateBeforeSolve(bool prediction, float frameTime)

9
Content.Server/Physics/Controllers/PullController.cs
View File

@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Shared.Pulling; using Content.Shared.Pulling;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths; using Robust.Shared.Maths;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Controllers;
@@ -33,15 +34,13 @@ namespace Content.Server.Physics.Controllers
// Velocity change of -LinearVelocity * frameTime * this // Velocity change of -LinearVelocity * frameTime * this
private const float SettleShutdownMultiplier = 20.0f; private const float SettleShutdownMultiplier = 20.0f;
private SharedPullingSystem _pullableSystem = default!; [Dependency] private readonly SharedPullingSystem _pullableSystem = default!;
public override List<Type> UpdatesAfter => new() {typeof(MoverController)};
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); UpdatesAfter.Add(typeof(MoverController));
_pullableSystem = EntitySystem.Get<SharedPullingSystem>(); base.Initialize();
} }
public override void UpdateBeforeSolve(bool prediction, float frameTime) public override void UpdateBeforeSolve(bool prediction, float frameTime)