NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-08 03:54:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Merge pull request #821 from PrPleGoo/FixIssue719

Browse source
This commit is contained in:
Pieter-Jan Briers 2020-04-17 21:00:31 +02:00 • committed by GitHub
commit 2d8085d52e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View file

@ -150,8 +150,8 @@ namespace Content.Server.GameObjects.Components
if(!entity.Transform.IsMapTransform)
continue;
// only items that can be stored in an inventory, or a player, can be eaten by a locker
if(!entity.HasComponent<StoreableComponent>() && !entity.HasComponent<IActorComponent>())
// only items that can be stored in an inventory, or a mob, can be eaten by a locker
if (!entity.HasComponent<StoreableComponent>() && !entity.HasComponent<SpeciesComponent>())
continue;
if (!AddToContents(entity))
@ -207,7 +207,8 @@ namespace Content.Server.GameObjects.Components
private bool AddToContents(IEntity entity)
{
var collidableComponent = Owner.GetComponent<ICollidableComponent>();
if(entity.TryGetComponent<ICollidableComponent>(out var entityCollidableComponent))
ICollidableComponent entityCollidableComponent;
if (entity.TryGetComponent(out entityCollidableComponent))
{
if(MaxSize < entityCollidableComponent.WorldAABB.Size.X
|| MaxSize < entityCollidableComponent.WorldAABB.Size.Y)
@ -247,6 +248,10 @@ namespace Content.Server.GameObjects.Components
}
Contents.Insert(entity);
entity.Transform.WorldPosition = worldPos;
if (entityCollidableComponent != null)
{
entityCollidableComponent.CollisionEnabled = false;
}
return true;
}
return false;
@ -256,7 +261,13 @@ namespace Content.Server.GameObjects.Components
{
foreach (var contained in Contents.ContainedEntities.ToArray())
{
Contents.Remove(contained);
if(Contents.Remove(contained))
{
if (contained.TryGetComponent<ICollidableComponent>(out var entityCollidableComponent))
{
entityCollidableComponent.CollisionEnabled = true;
}
}
}
}