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

Clothing/item ECS & cleanup (#9706)

Browse Source
This commit is contained in:
Kara
2022-07-27 03:53:47 -07:00
committed by GitHub
parent 0f0420eca9
commit 258ec0cac1
164 changed files with 938 additions and 918 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Disposal/SharedDisposalUnitSystem.cs
View File

@@ -33,7 +33,7 @@ namespace Content.Shared.Disposal
var otherBody = args.BodyB.Owner;
// Items dropped shouldn't collide but items thrown should
if (EntityManager.HasComponent<SharedItemComponent>(otherBody) &&
if (EntityManager.HasComponent<ItemComponent>(otherBody) &&
!EntityManager.HasComponent<ThrownItemComponent>(otherBody))
{
args.Cancel();
@@ -60,7 +60,7 @@ namespace Content.Shared.Disposal
return false;
// TODO: Probably just need a disposable tag.
if (!EntityManager.TryGetComponent(entity, out SharedItemComponent? storable) &&
if (!EntityManager.TryGetComponent(entity, out ItemComponent? storable) &&
!EntityManager.HasComponent<SharedBodyComponent>(entity))
{
return false;