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

Disable interactions for entities in storage

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-03 23:57:19 +02:00
parent 7f02d46cb4
commit 81647d696e
51 changed files with 81 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/GameObjects/Components/Items/Clothing/ClothingComponent.cs
View File

@@ -3,17 +3,18 @@
using Robust.Shared.Utility;
using System;
using System.Collections.Generic;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Shared.GameObjects;
using Content.Shared.GameObjects.Components.Items;
using Robust.Shared.IoC;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Serialization;
using static Content.Shared.GameObjects.Components.Inventory.EquipmentSlotDefines;
using Robust.Shared.Interfaces.GameObjects;
namespace Content.Server.GameObjects
namespace Content.Server.GameObjects.Components.Items.Clothing
{
[RegisterComponent]
[ComponentReference(typeof(ItemComponent))]

11
Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs
View File

@@ -212,6 +212,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
private bool AddToContents(IEntity entity)
{
if (!entity.HasComponent<InEntityStorageComponent>())
{
entity.AddComponent<InEntityStorageComponent>();
}
var collidableComponent = Owner.GetComponent<ICollidableComponent>();
ICollidableComponent entityCollidableComponent;
if (entity.TryGetComponent(out entityCollidableComponent))
@@ -273,6 +278,11 @@ namespace Content.Server.GameObjects.Components.Items.Storage
{
entityCollidableComponent.CanCollide = true;
}
if (contained.HasComponent<InEntityStorageComponent>())
{
contained.RemoveComponent<InEntityStorageComponent>();
}
}
}
}
@@ -407,6 +417,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
public void OnDestroy(DestructionEventArgs eventArgs)
{
Open = true;
EmptyContents();
}
}

16
Content.Server/GameObjects/Components/Items/Storage/InEntityStorageComponent.cs Normal file
View File

@@ -0,0 +1,16 @@
using Content.Shared.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
namespace Content.Server.GameObjects.Components.Items.Storage
{
[RegisterComponent]
public class InEntityStorageComponent : Component, IActionBlocker
{
public override string Name => "InEntityStorage";
public bool CanInteract()
{
return false;
}
}
}

2
Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs
View File

@@ -17,7 +17,7 @@ using Robust.Shared.Maths;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
namespace Content.Server.GameObjects
namespace Content.Server.GameObjects.Components.Items.Storage
{
[RegisterComponent]
[ComponentReference(typeof(StoreableComponent))]

5
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameObjects.Components;
using Content.Server.GameObjects.Components.Items.Storage;
using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces.GameObjects;
using Content.Server.Utility;
using Content.Shared.GameObjects.Components.Storage;
using Content.Shared.Interfaces;
using Robust.Server.GameObjects;
@@ -24,7 +21,7 @@ using Robust.Shared.Log;
using Robust.Shared.Players;
using Robust.Shared.Serialization;
namespace Content.Server.GameObjects
namespace Content.Server.GameObjects.Components.Items.Storage
{
/// <summary>
/// Storage component for containing entities within this one, matches a UI on the client which shows stored entities

2
Content.Server/GameObjects/Components/Items/Storage/StoreableComponent.cs
View File

@@ -1,7 +1,7 @@
using Robust.Shared.GameObjects;
using Robust.Shared.Serialization;
namespace Content.Server.GameObjects
namespace Content.Server.GameObjects.Components.Items.Storage
{
[RegisterComponent]
public class StoreableComponent : Component