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

Tiny pulling fixes (#5478)

Browse Source
This commit is contained in:
Clyybber
2021-11-23 14:02:08 +01:00
committed by GitHub
parent 159f84074d
commit 943e46eece
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,7 @@ namespace Content.Shared.Pulling
public void ForceRelationship(SharedPullerComponent? puller, SharedPullableComponent? pullable)
{
if ((puller != null) && (puller.Pulling == pullable))
if (pullable != null && puller != null && (puller.Pulling == pullable.Owner))
{
// Already done
return;

2
Content.Shared/Pulling/Systems/SharedPullingSystem.Actions.cs
View File

@@ -116,7 +116,7 @@ namespace Content.Shared.Pulling
// The main "start pulling" function.
public bool TryStartPull(SharedPullerComponent puller, SharedPullableComponent pullable)
{
if (puller.Pulling == pullable)
if (puller.Pulling == pullable.Owner)
return true;
// Pulling a new object : Perform sanity checks.