SharedItemComponent (#3513)

* StorableComponent refactor

* ItemComponent refactor

* conflict fixes

* removes redundant null check

* removes redundant item throwing code

* fix conflicts

* ExplosionLaunchedComponent

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
collinlunn
2021-04-02 04:01:03 -06:00
committed by GitHub
parent d9781c6f1c
commit f7aba5f701
21 changed files with 284 additions and 361 deletions

View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Collections.Generic;
using Content.Shared.GameObjects.Components.Body;
@@ -168,7 +168,7 @@ namespace Content.Shared.GameObjects.Components.Disposal
return false;
// TODO: Probably just need a disposable tag.
if (!entity.TryGetComponent(out SharedStorableComponent? storable) &&
if (!entity.TryGetComponent(out SharedItemComponent? storable) &&
!entity.HasComponent<IBody>())
{
return false;
@@ -182,7 +182,6 @@ namespace Content.Shared.GameObjects.Components.Disposal
return false;
}
}
return true;
}