From 3c17c82edd25ae8a37c5acb5ee9046a1dde26ee6 Mon Sep 17 00:00:00 2001
From: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Date: Mon, 27 Dec 2021 08:04:18 -0400
Subject: [PATCH] Fix EntityStorages eating you from afar (#5880)
* Fix lockers eating you from afar
* Reviews
---
.../Storage/Components/EntityStorageComponent.cs | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/Content.Server/Storage/Components/EntityStorageComponent.cs b/Content.Server/Storage/Components/EntityStorageComponent.cs
index 4df618660b..7ff590084a 100644
--- a/Content.Server/Storage/Components/EntityStorageComponent.cs
+++ b/Content.Server/Storage/Components/EntityStorageComponent.cs
@@ -57,6 +57,10 @@ namespace Content.Server.Storage.Components
[DataField("IsCollidableWhenOpen")]
private bool _isCollidableWhenOpen;
+ [ViewVariables]
+ [DataField("EnteringRange")]
+ private float _enteringRange = -0.4f;
+
[DataField("showContents")]
private bool _showContents;
@@ -144,6 +148,13 @@ namespace Content.Server.Storage.Components
}
}
+ [ViewVariables(VVAccess.ReadWrite)]
+ public float EnteringRange
+ {
+ get => _enteringRange;
+ set => _enteringRange = value;
+ }
+
///
protected override void Initialize()
{
@@ -447,7 +458,7 @@ namespace Content.Server.Storage.Components
protected virtual IEnumerable DetermineCollidingEntities()
{
var entityLookup = IoCManager.Resolve();
- return entityLookup.GetEntitiesIntersecting(Owner, -0.015f, LookupFlags.Approximate);
+ return entityLookup.GetEntitiesIntersecting(Owner, _enteringRange, LookupFlags.Approximate);
}
void IExAct.OnExplosion(ExplosionEventArgs eventArgs)