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

Improve pulling error logs (#10762)

Browse Source
This commit is contained in:
Leon Friedrich
2022-08-22 12:50:38 +12:00
committed by GitHub
parent 87d753e910
commit 7ec013b196
2 changed files with 36 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
Content.Shared/Pulling/Components/PullableComponent.cs
View File

@@ -40,49 +40,6 @@ namespace Content.Shared.Pulling.Components
[ViewVariables] [ViewVariables]
public bool PrevFixedRotation; public bool PrevFixedRotation;
public override ComponentState GetComponentState()
{
return new PullableComponentState(Puller);
}
public override void HandleComponentState(ComponentState? curState, ComponentState? nextState)
{
base.HandleComponentState(curState, nextState);
if (curState is not PullableComponentState state)
{
return;
}
if (!state.Puller.HasValue)
{
EntitySystem.Get<SharedPullingStateManagementSystem>().ForceDisconnectPullable(this);
return;
}
if (!state.Puller.Value.IsValid())
{
Logger.Error($"Invalid entity {state.Puller.Value} for pulling");
return;
}
if (Puller == state.Puller)
{
// don't disconnect and reconnect a puller for no reason
return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullerComponent?>(state.Puller.Value, out var comp))
{
Logger.Error($"Entity {state.Puller.Value} for pulling had no Puller component");
// ensure it disconnects from any different puller, still
EntitySystem.Get<SharedPullingStateManagementSystem>().ForceDisconnectPullable(this);
return;
}
EntitySystem.Get<SharedPullingStateManagementSystem>().ForceRelationship(comp, this);
}
protected override void OnRemove() protected override void OnRemove()
{ {
if (Puller != null) if (Puller != null)

36
Content.Shared/Pulling/Systems/SharedPullingStateManagementSystem.cs
View File

@@ -2,6 +2,7 @@ using System.Linq;
using Content.Shared.Physics.Pull; using Content.Shared.Physics.Pull;
using Content.Shared.Pulling.Components; using Content.Shared.Pulling.Components;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameStates;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Timing; using Robust.Shared.Timing;
@@ -24,6 +25,41 @@ namespace Content.Shared.Pulling
base.Initialize(); base.Initialize();
SubscribeLocalEvent<SharedPullableComponent, ComponentShutdown>(OnShutdown); SubscribeLocalEvent<SharedPullableComponent, ComponentShutdown>(OnShutdown);
SubscribeLocalEvent<SharedPullableComponent, ComponentGetState>(OnGetState);
SubscribeLocalEvent<SharedPullableComponent, ComponentHandleState>(OnHandleState);
}
private void OnGetState(EntityUid uid, SharedPullableComponent component, ref ComponentGetState args)
{
args.State = new PullableComponentState(component.Puller);
}
private void OnHandleState(EntityUid uid, SharedPullableComponent component, ref ComponentHandleState args)
{
if (args.Current is not PullableComponentState state)
return;
if (!state.Puller.HasValue)
{
ForceDisconnectPullable(component);
return;
}
if (component.Puller == state.Puller)
{
// don't disconnect and reconnect a puller for no reason
return;
}
if (!TryComp<SharedPullerComponent?>(state.Puller.Value, out var comp))
{
Logger.Error($"Pullable state for entity {ToPrettyString(uid)} had invalid puller entity {ToPrettyString(state.Puller.Value)}");
// ensure it disconnects from any different puller, still
ForceDisconnectPullable(component);
return;
}
ForceRelationship(comp, component);
} }
private void OnShutdown(EntityUid uid, SharedPullableComponent component, ComponentShutdown args) private void OnShutdown(EntityUid uid, SharedPullableComponent component, ComponentShutdown args)