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

Fix pulled physics objects not being woken up when the puller moves (#1720)

Browse Source
This commit is contained in:
DrSmugleaf
2020-08-16 21:08:05 +02:00
committed by GitHub
parent 3293dc4459
commit 9fb6afd08b
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Server/GameObjects/Components/GUI/HandsComponent.cs
View File

@@ -20,6 +20,7 @@ using Robust.Server.GameObjects.EntitySystemMessages;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.GameObjects.Components.Transform;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Network; using Robust.Shared.Interfaces.Network;
using Robust.Shared.IoC; using Robust.Shared.IoC;
@@ -571,6 +572,21 @@ namespace Content.Server.GameObjects.Components.GUI
} }
} }
private void MoveEvent(MoveEvent moveEvent)
{
if (moveEvent.Sender != Owner)
{
return;
}
if (!IsPulling)
{
return;
}
PulledObject!.WakeBody();
}
public override void HandleMessage(ComponentMessage message, IComponent? component) public override void HandleMessage(ComponentMessage message, IComponent? component)
{ {
base.HandleMessage(message, component); base.HandleMessage(message, component);
@@ -584,9 +600,13 @@ namespace Content.Server.GameObjects.Components.GUI
switch (message) switch (message)
{ {
case PullStartedMessage msg: case PullStartedMessage msg:
Owner.EntityManager.EventBus.SubscribeEvent<MoveEvent>(EventSource.Local, this, MoveEvent);
AddPullingStatuses(msg.Pulled.Owner); AddPullingStatuses(msg.Pulled.Owner);
break; break;
case PullStoppedMessage msg: case PullStoppedMessage msg:
Owner.EntityManager.EventBus.UnsubscribeEvent<MoveEvent>(EventSource.Local, this);
RemovePullingStatuses(msg.Pulled.Owner); RemovePullingStatuses(msg.Pulled.Owner);
break; break;
} }

6
Content.Shared/Physics/Pull/PullController.cs
View File

@@ -42,6 +42,8 @@ namespace Content.Shared.Physics.Pull
return; return;
} }
ControlledComponent.WakeBody();
var message = new PullStartedMessage(this, _puller, ControlledComponent); var message = new PullStartedMessage(this, _puller, ControlledComponent);
_puller.Owner.SendMessage(null, message); _puller.Owner.SendMessage(null, message);
@@ -64,6 +66,8 @@ namespace Content.Shared.Physics.Pull
return; return;
} }
ControlledComponent.WakeBody();
var message = new PullStoppedMessage(this, oldPuller, ControlledComponent); var message = new PullStoppedMessage(this, oldPuller, ControlledComponent);
oldPuller.Owner.SendMessage(null, message); oldPuller.Owner.SendMessage(null, message);
@@ -86,6 +90,8 @@ namespace Content.Shared.Physics.Pull
return; return;
} }
ControlledComponent.WakeBody();
var dist = _puller.Owner.Transform.GridPosition.Position - to.Position; var dist = _puller.Owner.Transform.GridPosition.Position - to.Position;
if (Math.Sqrt(dist.LengthSquared) > DistBeforeStopPull || if (Math.Sqrt(dist.LengthSquared) > DistBeforeStopPull ||