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

Thrown items become not-thrown if you start pulling them. (#4082)

Browse Source
This commit is contained in:
20kdc
2021-05-27 11:47:39 +01:00
committed by GitHub
parent 9500c91a69
commit cb9bef0b94
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Content.Shared/GameObjects/EntitySystems/ThrownItemSystem.cs
View File

@@ -2,9 +2,11 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Content.Shared.GameObjects.Components.Items; using Content.Shared.GameObjects.Components.Items;
using Content.Shared.Physics.Pull;
using Content.Shared.Interfaces.GameObjects.Components; using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Physics; using Robust.Shared.Physics;
using Robust.Shared.Physics.Dynamics;
namespace Content.Shared.GameObjects.EntitySystems namespace Content.Shared.GameObjects.EntitySystems
{ {
@@ -18,22 +20,28 @@ namespace Content.Shared.GameObjects.EntitySystems
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<PhysicsSleepMessage>(HandleSleep); SubscribeLocalEvent<ThrownItemComponent, PhysicsSleepMessage>(HandleSleep);
SubscribeLocalEvent<PullStartedMessage>(HandlePullStarted);
} }
public override void Shutdown() private void HandleSleep(EntityUid uid, ThrownItemComponent thrownItem, PhysicsSleepMessage message)
{ {
base.Shutdown(); LandComponent(thrownItem);
UnsubscribeLocalEvent<PhysicsSleepMessage>();
} }
private void HandleSleep(PhysicsSleepMessage message) private void HandlePullStarted(PullStartedMessage message)
{ {
// TODO: Sub to ThrownitemComponent // TODO: this isn't directed so things have to be done the bad way
if (message.Body.Deleted || !message.Body.Owner.TryGetComponent(out ThrownItemComponent? thrownItem)) return; if (message.Pulled.Owner.TryGetComponent(out ThrownItemComponent? thrownItem))
LandComponent(thrownItem);
}
private void LandComponent(ThrownItemComponent thrownItem)
{
if (thrownItem.Owner.Deleted) return;
var user = thrownItem.Thrower; var user = thrownItem.Thrower;
var landing = message.Body.Owner; var landing = thrownItem.Owner;
var coordinates = landing.Transform.Coordinates; var coordinates = landing.Transform.Coordinates;
// LandInteraction // LandInteraction