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

Fix pullable movement modifier (#4684)

Browse Source
This commit is contained in:
metalgearsloth
2021-09-24 08:43:59 +10:00
committed by GitHub
parent 08184bc928
commit 5add2f1f80
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Shared/Pulling/Components/SharedPullableComponent.cs
View File

@@ -47,6 +47,7 @@ namespace Content.Shared.Pulling.Components
} }
var eventBus = Owner.EntityManager.EventBus; var eventBus = Owner.EntityManager.EventBus;
// TODO: JESUS
// New value. Abandon being pulled by any existing object. // New value. Abandon being pulled by any existing object.
if (_puller != null) if (_puller != null)
@@ -54,6 +55,11 @@ namespace Content.Shared.Pulling.Components
var oldPuller = _puller; var oldPuller = _puller;
var oldPullerPhysics = PullerPhysics; var oldPullerPhysics = PullerPhysics;
if (_puller.TryGetComponent(out SharedPullerComponent? puller))
{
puller.Pulling = null;
}
_puller = null; _puller = null;
Dirty(); Dirty();
PullerPhysics = null; PullerPhysics = null;
@@ -67,6 +73,7 @@ namespace Content.Shared.Pulling.Components
_physics.WakeBody(); _physics.WakeBody();
} }
// else-branch warning is handled below // else-branch warning is handled below
} }