tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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

9
Content.Shared/Shuttles/Components/PilotComponent.cs
View File

@@ -4,7 +4,6 @@ using Robust.Shared.GameStates;
using Robust.Shared.IoC;
using Robust.Shared.Log;
using Robust.Shared.Map;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
using Robust.Shared.ViewVariables;
@@ -32,7 +31,8 @@ namespace Content.Shared.Shuttles.Components
base.HandleComponentState(curState, nextState);
if (curState is not PilotComponentState state) return;
if (state.Console == null)
var console = state.Console.GetValueOrDefault();
if (!console.IsValid())
{
Console = null;
return;
@@ -40,10 +40,9 @@ namespace Content.Shared.Shuttles.Components
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetEntity(state.Console.Value, out var consoleEnt) ||
!entityManager.TryGetComponent(consoleEnt.Value, out SharedShuttleConsoleComponent? shuttleConsoleComponent))
if (!entityManager.TryGetComponent(console, out SharedShuttleConsoleComponent? shuttleConsoleComponent))
{
Logger.Warning($"Unable to set Helmsman console to {state.Console.Value}");
Logger.Warning($"Unable to set Helmsman console to {console}");
return;
}