juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

caninsert entitystorage tweaks (#20589)

Browse Source
This commit is contained in:
Nemanja
2023-09-28 23:55:29 -04:00
committed by GitHub
parent d664c906ad
commit 90605212fc
5 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Content.Shared/Storage/EntitySystems/SharedEntityStorageSystem.cs
View File

@@ -15,7 +15,6 @@ using Content.Shared.Storage.Components;
using Content.Shared.Tools.Systems;
using Content.Shared.Verbs;
using Content.Shared.Wall;
using Content.Shared.Whitelist;
using Robust.Shared.Containers;
using Robust.Shared.GameStates;
using Robust.Shared.Map;
@@ -41,7 +40,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
[Dependency] private readonly SharedJointSystem _joints = default!;
[Dependency] private readonly SharedPhysicsSystem _physics = default!;
[Dependency] protected readonly SharedPopupSystem Popup = default!;
[Dependency] private readonly SharedTransformSystem _transform = default!;
[Dependency] protected readonly SharedTransformSystem TransformSystem = default!;
[Dependency] private readonly WeldableSystem _weldable = default!;
public const string ContainerName = "entity_storage";
@@ -103,7 +102,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
protected void OnDestruction(EntityUid uid, SharedEntityStorageComponent component, DestructionEventArgs args)
{
component.Open = true;
Dirty(component);
Dirty(uid, component);
if (!component.DeleteContentsOnDestruction)
{
EmptyContents(uid, component);
@@ -199,7 +198,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
var beforeev = new StorageBeforeOpenEvent();
RaiseLocalEvent(uid, ref beforeev);
component.Open = true;
Dirty(component);
Dirty(uid, component);
EmptyContents(uid, component);
ModifyComponents(uid, component);
if (_net.IsClient && _timing.IsFirstTimePredicted)
@@ -215,7 +214,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
return;
component.Open = false;
Dirty(component);
Dirty(uid, component);
var targetCoordinates = new EntityCoordinates(uid, component.EnteringOffset);
@@ -228,7 +227,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
{
if (!ev.BypassChecks.Contains(entity))
{
if (!CanFit(entity, uid, component.Whitelist))
if (!CanInsert(entity, uid, component))
continue;
}
@@ -256,7 +255,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
if (component.Open)
{
_transform.SetWorldPosition(toInsert, _transform.GetWorldPosition(container));
TransformSystem.SetWorldPosition(toInsert, TransformSystem.GetWorldPosition(container));
return true;
}
@@ -276,12 +275,12 @@ public abstract class SharedEntityStorageSystem : EntitySystem
RemComp<InsideEntityStorageComponent>(toRemove);
component.Contents.Remove(toRemove, EntityManager);
var pos = _transform.GetWorldPosition(xform) + _transform.GetWorldRotation(xform).RotateVec(component.EnteringOffset);
_transform.SetWorldPosition(toRemove, pos);
var pos = TransformSystem.GetWorldPosition(xform) + TransformSystem.GetWorldRotation(xform).RotateVec(component.EnteringOffset);
TransformSystem.SetWorldPosition(toRemove, pos);
return true;
}
public bool CanInsert(EntityUid container, SharedEntityStorageComponent? component = null)
public bool CanInsert(EntityUid toInsert, EntityUid container, SharedEntityStorageComponent? component = null)
{
if (!ResolveStorage(container, ref component))
return false;
@@ -292,7 +291,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
if (component.Contents.ContainedEntities.Count >= component.Capacity)
return false;
return true;
return CanFit(toInsert, container, component);
}
public bool TryOpenStorage(EntityUid user, EntityUid target, bool silent = false)
@@ -376,8 +375,11 @@ public abstract class SharedEntityStorageSystem : EntitySystem
return Insert(toAdd, container, component);
}
public bool CanFit(EntityUid toInsert, EntityUid container, EntityWhitelist? whitelist)
private bool CanFit(EntityUid toInsert, EntityUid container, SharedEntityStorageComponent? component = null)
{
if (!Resolve(container, ref component))
return false;
// conditions are complicated because of pizzabox-related issues, so follow this guide
// 0. Accomplish your goals at all costs.
// 1. AddToContents can block anything
@@ -395,7 +397,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
var targetIsMob = HasComp<BodyComponent>(toInsert);
var storageIsItem = HasComp<ItemComponent>(container);
var allowedToEat = whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
var allowedToEat = component.Whitelist?.IsValid(toInsert) ?? HasComp<ItemComponent>(toInsert);
// BEFORE REPLACING THIS WITH, I.E. A PROPERTY:
// Make absolutely 100% sure you have worked out how to stop people ending up in backpacks.