cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix pulling HandleComponentState (#4773)

This commit is contained in:
20kdc 2021-10-05 22:51:34 +01:00 committed by GitHub
parent eb5f447e7a
commit 021f281dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ namespace Content.Shared.Pulling.Components
/// <summary>
/// The current entity pulling this component.
/// Ideally, alter using TryStartPull and TryStopPull.
/// SharedPullingStateManagementSystem should be writing this. This means definitely not you.
/// </summary>
public IEntity? Puller { get; set; }
/// <summary>
@ -57,7 +57,7 @@ namespace Content.Shared.Pulling.Components
if (state.Puller == null)
{
Puller = null;
EntitySystem.Get<SharedPullingStateManagementSystem>().ForceDisconnectPullable(this);
return;
}
@ -67,7 +67,21 @@ namespace Content.Shared.Pulling.Components
return;
}
Puller = entity;
if (Puller == entity)
{
// don't disconnect and reconnect a puller for no reason
return;
}
if (!entity.TryGetComponent<SharedPullerComponent>(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 Shutdown()