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

Fix not staying buckled to a strap when both the buckled and the strap go into the same container

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-08 15:30:48 +02:00
parent 8f9af88bb2
commit f5a9f91de4
2 changed files with 90 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,6 +72,8 @@ namespace Content.Server.GameObjects.Components.Mobs
[ViewVariables]
protected override bool Buckled => BuckledTo != null;
public bool ContainerChanged { get; private set; }
[ViewVariables]
public int Size => _size;
@@ -86,6 +88,30 @@ namespace Content.Server.GameObjects.Components.Mobs
}
}
private void ReAttach(StrapComponent strap)
{
var ownTransform = Owner.Transform;
var strapTransform = strap.Owner.Transform;
ownTransform.GridPosition = strapTransform.GridPosition;
ownTransform.AttachParent(strapTransform);
switch (strap.Position)
{
case StrapPosition.None:
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Stand:
StandingStateHelper.Standing(Owner);
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Down:
StandingStateHelper.Down(Owner);
ownTransform.WorldRotation = Angle.South;
break;
}
}
private bool TryBuckle(IEntity user, IEntity to)
{
if (user == null || user == to)
@@ -176,26 +202,7 @@ namespace Content.Server.GameObjects.Components.Mobs
appearance.SetData(BuckleVisuals.Buckled, true);
}
var ownTransform = Owner.Transform;
var strapTransform = strap.Owner.Transform;
ownTransform.GridPosition = strapTransform.GridPosition;
ownTransform.AttachParent(strapTransform);
switch (strap.Position)
{
case StrapPosition.None:
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Stand:
StandingStateHelper.Standing(Owner);
ownTransform.WorldRotation = strapTransform.WorldRotation;
break;
case StrapPosition.Down:
StandingStateHelper.Down(Owner);
ownTransform.WorldRotation = Angle.South;
break;
}
ReAttach(strap);
BuckledTo = strap;
BuckleStatus();
@@ -283,14 +290,38 @@ namespace Content.Server.GameObjects.Components.Mobs
return TryBuckle(user, to);
}
private void InsertIntoContainer(EntInsertedIntoContainerMessage message)
private void InsertIntoContainer(ContainerModifiedMessage message)
{
if (message.Entity != Owner)
{
return;
}
TryUnbuckle(Owner, true);
ContainerChanged = true;
}
public void Update()
{
if (!ContainerChanged || BuckledTo == null)
{
return;
}
var contained = ContainerHelpers.TryGetContainer(Owner, out var ownContainer);
var strapContained = ContainerHelpers.TryGetContainer(BuckledTo.Owner, out var strapContainer);
if (contained != strapContained || ownContainer != strapContainer)
{
TryUnbuckle(Owner, true);
return;
}
if (!contained && !strapContained)
{
ReAttach(BuckledTo);
}
ContainerChanged = false;
}
public override void ExposeData(ObjectSerializer serializer)
@@ -311,6 +342,7 @@ namespace Content.Server.GameObjects.Components.Mobs
base.Initialize();
_entityManager.EventBus.SubscribeEvent<EntInsertedIntoContainerMessage>(EventSource.Local, this, InsertIntoContainer);
_entityManager.EventBus.SubscribeEvent<EntRemovedFromContainerMessage>(EventSource.Local, this, InsertIntoContainer);
}
protected override void Startup()
@@ -331,7 +363,8 @@ namespace Content.Server.GameObjects.Components.Mobs
strap.Remove(this);
}
BuckledTo = null;
TryUnbuckle(Owner, true);
_buckleTime = default;
BuckleStatus();
}