Updated ContainerHelpers to use new extensions (#2530)
Co-authored-by: David Tan <>
This commit is contained in:
@@ -59,7 +59,7 @@ namespace Content.Shared.GameObjects.Components.Movement
|
||||
private bool TrySlip(IEntity entity)
|
||||
{
|
||||
if (!Slippery
|
||||
|| ContainerHelpers.IsInContainer(Owner)
|
||||
|| Owner.IsInContainer()
|
||||
|| _slipped.Contains(entity.Uid)
|
||||
|| !entity.TryGetComponent(out SharedStunnableComponent stun)
|
||||
|| !entity.TryGetComponent(out IPhysicsComponent otherBody)
|
||||
|
||||
@@ -27,7 +27,7 @@ namespace Content.Shared.GameObjects.Components
|
||||
_count = value;
|
||||
if (_count <= 0)
|
||||
{
|
||||
if (ContainerHelpers.TryGetContainerMan(Owner, out var containerManager))
|
||||
if (Owner.TryGetContainerMan(out var containerManager))
|
||||
{
|
||||
containerManager.Remove(Owner);
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ namespace Content.Shared.GameObjects.EntitySystems
|
||||
|
||||
Ignored predicate = entity => entity == examiner || entity == examined;
|
||||
|
||||
if (ContainerHelpers.TryGetContainer(examiner, out var container))
|
||||
if (examiner.TryGetContainer(out var container))
|
||||
{
|
||||
predicate += entity => entity == container.Owner;
|
||||
}
|
||||
|
||||
@@ -86,7 +86,7 @@ namespace Content.Shared.GameObjects.Verbs
|
||||
{
|
||||
if (!user.IsInSameOrNoContainer(target))
|
||||
{
|
||||
if (!ContainerHelpers.TryGetContainer(target, out var container) ||
|
||||
if (!target.TryGetContainer(out var container) ||
|
||||
container.Owner != user)
|
||||
{
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user