Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Portal pull fix (#13336)

Browse Source
This commit is contained in:
Kara
2023-01-05 05:36:25 -06:00
committed by GitHub
parent 373ffdc1d3
commit d13593b27e
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Shared/Teleportation/Systems/PortalSystem.cs
View File

@@ -1,5 +1,7 @@
using System.Linq; using System.Linq;
using Content.Shared.Projectiles; using Content.Shared.Projectiles;
using Content.Shared.Pulling;
using Content.Shared.Pulling.Components;
using Content.Shared.Teleportation.Components; using Content.Shared.Teleportation.Components;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -19,6 +21,7 @@ public sealed class PortalSystem : EntitySystem
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly INetManager _netMan = default!; [Dependency] private readonly INetManager _netMan = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPullingSystem _pulling = default!;
private const string PortalFixture = "portalFixture"; private const string PortalFixture = "portalFixture";
private const string ProjectileFixture = "projectile"; private const string ProjectileFixture = "projectile";
@@ -62,6 +65,18 @@ public sealed class PortalSystem : EntitySystem
if (Transform(subject).Anchored) if (Transform(subject).Anchored)
return; return;
// break pulls before portal enter so we dont break shit
if (TryComp<SharedPullableComponent>(subject, out var pullable) && pullable.BeingPulled)
{
_pulling.TryStopPull(pullable);
}
if (TryComp<SharedPullerComponent>(subject, out var pulling)
&& pulling.Pulling != null && TryComp<SharedPullableComponent>(pulling.Pulling.Value, out var subjectPulling))
{
_pulling.TryStopPull(subjectPulling);
}
// if they came from another portal, just return and wait for them to exit the portal // if they came from another portal, just return and wait for them to exit the portal
if (HasComp<PortalTimeoutComponent>(subject)) if (HasComp<PortalTimeoutComponent>(subject))
{ {