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

Replace IsContained with ContainerHelpers.IsInContainer

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-03 23:43:01 +02:00
parent dd72c1e3f0
commit 7f02d46cb4
1 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ using JetBrains.Annotations;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.Components.Container; using Robust.Server.GameObjects.Components.Container;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC; 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) private bool TryBuckle(IEntity user, IEntity to)
{ {
if (user == null || user == to) if (user == null || user == to)
@@ -94,7 +79,7 @@ namespace Content.Server.GameObjects.Components.Mobs
var range = SharedInteractionSystem.InteractionRange / 2; var range = SharedInteractionSystem.InteractionRange / 2;
if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, range) || if (!InteractionChecks.InRangeUnobstructed(user, strapPosition, range) ||
IsContained()) ContainerHelpers.IsInContainer(Owner))
{ {
_notifyManager.PopupMessage(user, user, _notifyManager.PopupMessage(user, user,
Loc.GetString("You can't reach there!")); Loc.GetString("You can't reach there!"));