tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shared Containers (#3331)

Browse Source 
* Namespace changes for containers.
Moved ContainerSlot from content to engine.

* Merged client/server ContainerManagerComponents into a single shared version.

* Mapfile and nullability fixes.

* Upgrades map.

* Update engine.
This commit is contained in:
Acruid
2021-03-01 15:24:46 -08:00
committed by GitHub
parent adda1ee404
commit 6c081d9d8d
64 changed files with 796 additions and 1439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameObjects/Components/Construction/ConstructionComponent.cs
View File

@@ -11,7 +11,7 @@ using Content.Shared.Construction;
using Content.Shared.GameObjects.Components.Interactable;
using Content.Shared.GameObjects.EntitySystems;
using Content.Shared.Interfaces.GameObjects.Components;
using Robust.Server.GameObjects;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
@@ -286,7 +286,7 @@ namespace Content.Server.GameObjects.Components.Construction
else
{
_containers.Add(insertStep.Store);
var container = ContainerManagerComponent.Ensure<Container>(insertStep.Store, Owner);
var container = ContainerHelpers.EnsureContainer<Container>(Owner, insertStep.Store);
container.Insert(entityUsing);
}
@@ -425,7 +425,7 @@ namespace Content.Server.GameObjects.Components.Construction
{
foreach (var container in _containers)
{
var otherContainer = ContainerManagerComponent.Ensure<Container>(container, entity);
var otherContainer = ContainerHelpers.EnsureContainer<Container>(entity, container);
var ourContainer = containerComp.GetContainer(container);
foreach (var ent in ourContainer.ContainedEntities.ToArray())