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

Fix mechs picking up portals (#13581)

Browse Source
This commit is contained in:
metalgearsloth
2023-01-21 01:14:00 +11:00
committed by GitHub
parent 48493d2aa9
commit 1f3dba9235
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/Mech/Equipment/EntitySystems/MechGrabberSystem.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Interaction;
using Content.Server.Mech.Components; using Content.Server.Mech.Components;
using Content.Server.Mech.Equipment.Components; using Content.Server.Mech.Equipment.Components;
using Content.Server.Mech.Systems; using Content.Server.Mech.Systems;
using Content.Shared.Construction.Components;
using Content.Shared.Interaction; using Content.Shared.Interaction;
using Content.Shared.Mech; using Content.Shared.Mech;
using Content.Shared.Mech.Equipment.Components; using Content.Shared.Mech.Equipment.Components;
@@ -11,6 +12,8 @@ using Content.Shared.Mobs.Components;
using Content.Shared.Wall; using Content.Shared.Wall;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Physics;
using Robust.Shared.Physics.Components;
namespace Content.Server.Mech.Equipment.EntitySystems; namespace Content.Server.Mech.Equipment.EntitySystems;
@@ -119,9 +122,12 @@ public sealed class MechGrabberSystem : EntitySystem
if (args.Handled || args.Target is not {} target) if (args.Handled || args.Target is not {} target)
return; return;
var xform = Transform(target); if (TryComp<PhysicsComponent>(uid, out var physics) && physics.BodyType == BodyType.Static && !HasComp<AnchorableComponent>(uid) ||
if (xform.Anchored || HasComp<WallMountComponent>(target) || HasComp<MobStateComponent>(target)) HasComp<WallMountComponent>(target) ||
HasComp<MobStateComponent>(target))
{
return; return;
}
if (component.ItemContainer.ContainedEntities.Count >= component.MaxContents) if (component.ItemContainer.ContainedEntities.Count >= component.MaxContents)
return; return;