Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Cardboard box fixes (#13087)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-20 16:33:59 +13:00
committed by GitHub
parent 5c9e4f6ca5
commit 586864ee85
3 changed files with 28 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,8 +118,6 @@ public sealed class StorageAfterOpenEvent : EventArgs { }
public sealed class StorageCloseAttemptEvent : CancellableEntityEventArgs { }
public sealed class StorageBeforeCloseEvent : EventArgs
{
public EntityUid Container;
public HashSet<EntityUid> Contents;
/// <summary>
@@ -127,9 +125,8 @@ public sealed class StorageBeforeCloseEvent : EventArgs
/// </summary>
public HashSet<EntityUid> BypassChecks = new();
public StorageBeforeCloseEvent(EntityUid container, HashSet<EntityUid> contents)
public StorageBeforeCloseEvent(HashSet<EntityUid> contents)
{
Container = container;
Contents = contents;
}
}

4
Content.Server/Storage/EntitySystems/EntityStorageSystem.cs
View File

@@ -178,8 +178,8 @@ public sealed class EntityStorageSystem : EntitySystem
var entities = _lookup.GetEntitiesInRange(targetCoordinates, component.EnteringRange, LookupFlags.Approximate | LookupFlags.Dynamic | LookupFlags.Sundries);
var ev = new StorageBeforeCloseEvent(uid, entities);
RaiseLocalEvent(uid, ev, true);
var ev = new StorageBeforeCloseEvent(entities);
RaiseLocalEvent(uid, ev);
var count = 0;
foreach (var entity in ev.Contents)
{