From 7f02d46cb4571c2c53e20b252be4c2ce30ef827f Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Fri, 3 Jul 2020 23:43:01 +0200 Subject: [PATCH] Replace IsContained with ContainerHelpers.IsInContainer --- .../Components/Mobs/BuckleComponent.cs | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs index efd7bd76e9..e166b67583 100644 --- a/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs +++ b/Content.Server/GameObjects/Components/Mobs/BuckleComponent.cs @@ -11,6 +11,7 @@ using JetBrains.Annotations; using Robust.Server.GameObjects; using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.EntitySystems; +using Robust.Shared.Containers; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; @@ -60,22 +61,6 @@ namespace Content.Server.GameObjects.Components.Mobs } } - private bool IsContained() - { - var parent = Owner.Transform.Parent; - if (parent == null) - { - return false; - } - - if (parent.Owner.TryGetComponent(out ContainerManagerComponent container)) - { - return container.ContainsEntity(Owner); - } - - return false; - } - private bool TryBuckle(IEntity user, IEntity to) { if (user == null || user == to) @@ -94,7 +79,7 @@ namespace Content.Server.GameObjects.Components.Mobs var range = SharedInteractionSystem.InteractionRange / 2; if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, range) || - IsContained()) + ContainerHelpers.IsInContainer(Owner)) { _notifyManager.PopupMessage(user, user, Loc.GetString("You can't reach there!"));