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

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Shuttles/Systems/DockingSystem.cs
View File

@@ -28,7 +28,6 @@ namespace Content.Server.Shuttles.Systems
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
private ISawmill _sawmill = default!;
private const string DockingFixture = "docking";
private const string DockingJoint = "docking";
private const float DockingRadius = 0.20f;
@@ -36,7 +35,6 @@ namespace Content.Server.Shuttles.Systems
public override void Initialize()
{
base.Initialize();
_sawmill = Logger.GetSawmill("docking");
SubscribeLocalEvent<DockingComponent, ComponentStartup>(OnStartup);
SubscribeLocalEvent<DockingComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<DockingComponent, AnchorStateChangedEvent>(OnAnchorChange);
@@ -114,7 +112,7 @@ namespace Content.Server.Shuttles.Systems
if (otherDockingFixture == null)
{
DebugTools.Assert(false);
_sawmill.Error($"Found null docking fixture on {ent}");
Log.Error($"Found null docking fixture on {ent}");
continue;
}
@@ -159,7 +157,7 @@ namespace Content.Server.Shuttles.Systems
!TryComp(dockBUid, out DockingComponent? dockB))
{
DebugTools.Assert(false);
_sawmill.Error($"Tried to cleanup {dockAUid} but not docked?");
Log.Error($"Tried to cleanup {dockAUid} but not docked?");
dockA.DockedWith = null;
if (dockA.DockJoint != null)
@@ -288,7 +286,7 @@ namespace Content.Server.Shuttles.Systems
(dockAUid, dockBUid) = (dockBUid, dockAUid);
}
_sawmill.Debug($"Docking between {dockAUid} and {dockBUid}");
Log.Debug($"Docking between {dockAUid} and {dockBUid}");
// https://gamedev.stackexchange.com/questions/98772/b2distancejoint-with-frequency-equal-to-0-vs-b2weldjoint