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

fix (#280)

Browse Source
This commit is contained in:
CaypenNow
2024-04-12 19:08:27 +05:00
committed by GitHub
parent 7632c7c99d
commit f83adf16f4
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/_White/ExperimentalSyndicateTeleporter/ExperimentalSyndicateTeleporter.cs
View File

@@ -11,6 +11,7 @@ using Content.Shared.Maps;
using Content.Shared.Popups; using Content.Shared.Popups;
using Content.Shared.Pulling.Components; using Content.Shared.Pulling.Components;
using Robust.Server.Audio; using Robust.Server.Audio;
using Robust.Server.Containers;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components; using Robust.Shared.Map.Components;
@@ -28,6 +29,7 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
[Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!;
[Dependency] private readonly PullingSystem _pullingSystem = default!; [Dependency] private readonly PullingSystem _pullingSystem = default!;
[Dependency] private readonly ContainerSystem _containerSystem = default!;
[Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IRobustRandom _random = default!;
public override void Initialize() public override void Initialize()
@@ -90,6 +92,12 @@ public sealed class ExperimentalSyndicateTeleporter : EntitySystem
_pullingSystem.TryStopPull(subjectPulling); _pullingSystem.TryStopPull(subjectPulling);
} }
if (_containerSystem.IsEntityInContainer(args.User))
{
if(!_containerSystem.TryRemoveFromContainer(args.User))
return;
}
var oldCoords = xform.Coordinates; var oldCoords = xform.Coordinates;
var random = _random.Next(component.MinTeleportRange, component.MaxTeleportRange); var random = _random.Next(component.MinTeleportRange, component.MaxTeleportRange);