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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Shuttles/EntitySystems/DockingSystem.cs
View File

@@ -1,5 +1,3 @@
using Content.Server.Atmos.Components;
using Content.Server.Atmos.EntitySystems;
using Content.Server.Doors.Components;
using Content.Server.Power.Components;
using Content.Server.Shuttles.Components;
@@ -112,7 +110,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (dockingFixture == null)
{
DebugTools.Assert(false);
Logger.ErrorS("docking", $"Found null fixture on {EntityManager.GetEntity(((IComponent) body).Owner)}");
Logger.ErrorS("docking", $"Found null fixture on {((IComponent) body).Owner)}"
return null;
}
@@ -146,7 +144,7 @@ namespace Content.Server.Shuttles.EntitySystems
if (otherDockingFixture == null)
{
DebugTools.Assert(false);
Logger.ErrorS("docking", $"Found null docking fixture on {EntityManager.GetEntity(ent)}");
Logger.ErrorS("docking", $"Found null docking fixture on {ent)}"
continue;
}

6
Content.Server/Shuttles/EntitySystems/ShuttleConsoleSystem.cs
View File

@@ -96,7 +96,7 @@ namespace Content.Server.Shuttles.EntitySystems
return;
}
var pilotComponent = EntityManager.EnsureComponent<PilotComponent>((EntityUid) args.User);
var pilotComponent = EntityManager.EnsureComponent<PilotComponent>(args.User);
if (!component.Enabled)
{
@@ -130,7 +130,7 @@ namespace Content.Server.Shuttles.EntitySystems
ClearPilots(component);
}
public void AddPilot(IEntity entity, ShuttleConsoleComponent component)
public void AddPilot(EntityUid entity, ShuttleConsoleComponent component)
{
if (!_blocker.CanInteract(entity) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out PilotComponent? pilotComponent) ||
@@ -174,7 +174,7 @@ namespace Content.Server.Shuttles.EntitySystems
EntityManager.RemoveComponent<PilotComponent>(pilotComponent.Owner);
}
public void RemovePilot(IEntity entity)
public void RemovePilot(EntityUid entity)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out PilotComponent? pilotComponent)) return;

2
Content.Server/Shuttles/EntitySystems/ShuttleSystem.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.Shuttles.EntitySystems
private void OnGridInit(GridInitializeEvent ev)
{
EntityManager.GetEntity(ev.EntityUid).EnsureComponent<ShuttleComponent>();
ev.EntityUid).EnsureComponent<ShuttleComponent>(
}
private void OnShuttleStartup(EntityUid uid, ShuttleComponent component, ComponentStartup args)