Server/Storage: allow specifying a radius for _areaInsert (#5001)

️ Pay no attention to the changes in trashbag.yml... they are merely an
illusion... ️

t. 🧙‍♂️
This commit is contained in:
E F R
2021-10-24 02:34:29 +00:00
committed by GitHub
parent 023832d4e8
commit c5dd6c8b02
2 changed files with 22 additions and 1 deletions

View File

@@ -56,6 +56,8 @@ namespace Content.Server.Storage.Components
[DataField("areaInsert")]
private bool _areaInsert = false; // "Attacking" with the storage entity causes it to insert all nearby storables after a delay
[DataField("areaInsertRadius")]
private int _areaInsertRadius = 1;
[DataField("whitelist")]
private EntityWhitelist? _whitelist = null;
@@ -510,7 +512,7 @@ namespace Content.Server.Storage.Components
if (_areaInsert && (eventArgs.Target == null || !eventArgs.Target.HasComponent<SharedItemComponent>()))
{
var validStorables = new List<IEntity>();
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, 1))
foreach (var entity in IoCManager.Resolve<IEntityLookup>().GetEntitiesInRange(eventArgs.ClickLocation, _areaInsertRadius))
{
if (entity.IsInContainer()
|| entity == eventArgs.User