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

entitystorage fixes (#5660)

Browse Source
This commit is contained in:
metalgearsloth
2021-12-03 21:19:53 +11:00
committed by GitHub
parent bd18574412
commit 07b2ce138d
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -373,14 +373,7 @@ namespace Content.Server.Storage.Components
return true; return true;
} }
if (!Contents.Insert(entity)) return false; return Contents.Insert(entity);
entity.Transform.LocalPosition = Vector2.Zero;
if (entity.TryGetComponent(out IPhysBody? body))
{
body.CanCollide = false;
}
return true;
} }
/// <inheritdoc /> /// <inheritdoc />

2
Content.Server/Storage/Components/IStorageComponent.cs
View File

@@ -2,7 +2,7 @@ using Robust.Shared.GameObjects;
namespace Content.Server.Storage.Components namespace Content.Server.Storage.Components
{ {
public interface IStorageComponent public interface IStorageComponent : IComponent
{ {
bool Remove(IEntity entity); bool Remove(IEntity entity);
bool Insert(IEntity entity); bool Insert(IEntity entity);

8
Content.Server/Storage/Components/StorageFillComponent.cs
View File

@@ -50,8 +50,12 @@ namespace Content.Server.Storage.Components
for (var i = 0; i < storageItem.Amount; i++) for (var i = 0; i < storageItem.Amount; i++)
{ {
storage.Insert( var ent = Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates);
Owner.EntityManager.SpawnEntity(storageItem.PrototypeId, Owner.Transform.Coordinates));
if (storage.Insert(ent)) continue;
Logger.ErrorS("storage", $"Tried to StorageFill {storageItem.PrototypeId} inside {Owner} but can't.");
Owner.EntityManager.DeleteEntity(ent);
} }
if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId); if (!string.IsNullOrEmpty(storageItem.GroupId)) alreadySpawnedGroups.Add(storageItem.GroupId);