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

Add unbuckling the entity if put into a container

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-08 14:45:25 +02:00
parent 770d4e72e7
commit 8f9af88bb2
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs
View File

@@ -10,6 +10,7 @@ using Content.Shared.GameObjects.Components.Mobs;
using Content.Shared.GameObjects.Components.Strap; using Content.Shared.GameObjects.Components.Strap;
using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.EntitySystems;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystemMessages;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
@@ -27,9 +28,10 @@ namespace Content.Server.GameObjects.Components.Mobs
public class BuckleComponent : SharedBuckleComponent, IInteractHand, IDragDrop public class BuckleComponent : SharedBuckleComponent, IInteractHand, IDragDrop
{ {
#pragma warning disable 649 #pragma warning disable 649
[Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IEntitySystemManager _entitySystem = default!; [Dependency] private readonly IEntitySystemManager _entitySystem = default!;
[Dependency] private readonly IServerNotifyManager _notifyManager = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly IGameTiming _gameTiming = default!;
[Dependency] private readonly IServerNotifyManager _notifyManager = default!;
#pragma warning restore 649 #pragma warning restore 649
/// <summary> /// <summary>
@@ -281,6 +283,16 @@ namespace Content.Server.GameObjects.Components.Mobs
return TryBuckle(user, to); return TryBuckle(user, to);
} }
private void InsertIntoContainer(EntInsertedIntoContainerMessage message)
{
if (message.Entity != Owner)
{
return;
}
TryUnbuckle(Owner, true);
}
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
@@ -294,6 +306,13 @@ namespace Content.Server.GameObjects.Components.Mobs
_unbuckleDelay = TimeSpan.FromSeconds(seconds); _unbuckleDelay = TimeSpan.FromSeconds(seconds);
} }
public override void Initialize()
{
base.Initialize();
_entityManager.EventBus.SubscribeEvent<EntInsertedIntoContainerMessage>(EventSource.Local, this, InsertIntoContainer);
}
protected override void Startup() protected override void Startup()
{ {
base.Startup(); base.Startup();
@@ -304,6 +323,8 @@ namespace Content.Server.GameObjects.Components.Mobs
{ {
base.OnRemove(); base.OnRemove();
_entityManager.EventBus.UnsubscribeEvents(this);
if (BuckledTo != null && if (BuckledTo != null &&
BuckledTo.Owner.TryGetComponent(out StrapComponent strap)) BuckledTo.Owner.TryGetComponent(out StrapComponent strap))
{ {