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

Content ecs containers (#22484)

Browse Source
This commit is contained in:
TemporalOroboros
2023-12-27 21:30:03 -08:00
committed by GitHub
parent 1d06539432
commit 7a77d6d5dd
72 changed files with 172 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Storage/EntitySystems/BinSystem.cs
View File

@@ -138,7 +138,7 @@ public sealed class BinSystem : EntitySystem
if (component.Whitelist != null && !component.Whitelist.IsValid(toInsert))
return false;
component.ItemContainer.Insert(toInsert);
_container.Insert(toInsert, component.ItemContainer);
component.Items.Add(toInsert);
Dirty(component);
return true;
@@ -162,7 +162,7 @@ public sealed class BinSystem : EntitySystem
if (toRemove == null || toRemove != component.Items.LastOrDefault())
return false;
if (!component.ItemContainer.Remove(toRemove.Value))
if (!_container.Remove(toRemove.Value, component.ItemContainer))
return false;
component.Items.Remove(toRemove.Value);

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

@@ -263,7 +263,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
}
_joints.RecursiveClearJoints(toInsert);
if (!component.Contents.Insert(toInsert, EntityManager))
if (!_container.Insert(toInsert, component.Contents))
return false;
var inside = EnsureComp<InsideEntityStorageComponent>(toInsert);
@@ -280,7 +280,7 @@ public abstract class SharedEntityStorageSystem : EntitySystem
return false;
RemComp<InsideEntityStorageComponent>(toRemove);
component.Contents.Remove(toRemove, EntityManager);
_container.Remove(toRemove, component.Contents);
var pos = TransformSystem.GetWorldPosition(xform) + TransformSystem.GetWorldRotation(xform).RotateVec(component.EnteringOffset);
TransformSystem.SetWorldPosition(toRemove, pos);
return true;