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

Fix EntityStorages eating you from afar (#5880)

Browse Source 
* Fix lockers eating you from afar

* Reviews
This commit is contained in:
AJCM-git
2021-12-27 08:04:18 -04:00
committed by GitHub
parent e51f6ee851
commit 3c17c82edd
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -57,6 +57,10 @@ namespace Content.Server.Storage.Components
[DataField("IsCollidableWhenOpen")] [DataField("IsCollidableWhenOpen")]
private bool _isCollidableWhenOpen; private bool _isCollidableWhenOpen;
[ViewVariables]
[DataField("EnteringRange")]
private float _enteringRange = -0.4f;
[DataField("showContents")] [DataField("showContents")]
private bool _showContents; private bool _showContents;
@@ -144,6 +148,13 @@ namespace Content.Server.Storage.Components
} }
} }
[ViewVariables(VVAccess.ReadWrite)]
public float EnteringRange
{
get => _enteringRange;
set => _enteringRange = value;
}
/// <inheritdoc /> /// <inheritdoc />
protected override void Initialize() protected override void Initialize()
{ {
@@ -447,7 +458,7 @@ namespace Content.Server.Storage.Components
protected virtual IEnumerable<EntityUid> DetermineCollidingEntities() protected virtual IEnumerable<EntityUid> DetermineCollidingEntities()
{ {
var entityLookup = IoCManager.Resolve<IEntityLookup>(); var entityLookup = IoCManager.Resolve<IEntityLookup>();
return entityLookup.GetEntitiesIntersecting(Owner, -0.015f, LookupFlags.Approximate); return entityLookup.GetEntitiesIntersecting(Owner, _enteringRange, LookupFlags.Approximate);
} }
void IExAct.OnExplosion(ExplosionEventArgs eventArgs) void IExAct.OnExplosion(ExplosionEventArgs eventArgs)