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

Replace InEntityStorageComponent with in container check

Browse Source
This commit is contained in:
DrSmugleaf
2020-07-07 01:00:29 +02:00
parent 0a292634be
commit 5901e6e45f
3 changed files with 3 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,16 +120,6 @@ namespace Content.Server.GameObjects.Components
serializer.DataField(this, a => a.CanWeldShut, "CanWeldShut", true); serializer.DataField(this, a => a.CanWeldShut, "CanWeldShut", true);
} }
protected override void Shutdown()
{
base.Shutdown();
foreach (var entity in _contents.ContainedEntities)
{
entity.RemoveComponent<InEntityStorageComponent>();
}
}
public virtual void Activate(ActivateEventArgs eventArgs) public virtual void Activate(ActivateEventArgs eventArgs)
{ {
ToggleOpen(eventArgs.User); ToggleOpen(eventArgs.User);
@@ -224,8 +214,6 @@ namespace Content.Server.GameObjects.Components
private bool AddToContents(IEntity entity) private bool AddToContents(IEntity entity)
{ {
entity.EnsureComponent<InEntityStorageComponent>();
var collidableComponent = Owner.GetComponent<ICollidableComponent>(); var collidableComponent = Owner.GetComponent<ICollidableComponent>();
ICollidableComponent entityCollidableComponent; ICollidableComponent entityCollidableComponent;
if (entity.TryGetComponent(out entityCollidableComponent)) if (entity.TryGetComponent(out entityCollidableComponent))
@@ -287,11 +275,6 @@ namespace Content.Server.GameObjects.Components
{ {
entityCollidableComponent.CanCollide = true; entityCollidableComponent.CanCollide = true;
} }
if (contained.HasComponent<InEntityStorageComponent>())
{
contained.RemoveComponent<InEntityStorageComponent>();
}
} }
} }
} }

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

@@ -1,16 +0,0 @@
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;
}
}
}

4
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -13,6 +13,7 @@ using JetBrains.Annotations;
using Robust.Server.GameObjects; using Robust.Server.GameObjects;
using Robust.Server.GameObjects.EntitySystems; using Robust.Server.GameObjects.EntitySystems;
using Robust.Server.Interfaces.Player; using Robust.Server.Interfaces.Player;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects; using Robust.Shared.GameObjects;
using Robust.Shared.GameObjects.Components; using Robust.Shared.GameObjects.Components;
using Robust.Shared.Input; using Robust.Shared.Input;
@@ -261,7 +262,8 @@ namespace Content.Server.GameObjects.EntitySystems.Click
} }
} }
if (!ActionBlockerSystem.CanInteract(player)) if (!ActionBlockerSystem.CanInteract(player) ||
ContainerHelpers.IsInContainer(player))
{ {
return; return;
} }