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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Shared/Strip/Components/SharedStrippableComponent.cs
View File

@@ -17,8 +17,8 @@ namespace Content.Shared.Strip.Components
public bool CanBeStripped(IEntity by)
{
return by != Owner
&& IoCManager.Resolve<IEntityManager>().HasComponent<SharedHandsComponent>(@by.Uid)
&& EntitySystem.Get<ActionBlockerSystem>().CanInteract(by.Uid);
&& IoCManager.Resolve<IEntityManager>().HasComponent<SharedHandsComponent>(@by)
&& EntitySystem.Get<ActionBlockerSystem>().CanInteract(@by);
}
bool IDraggable.CanDrop(CanDropEvent args)

2
Content.Shared/Strip/Components/SharedStrippingComponent.cs
View File

@@ -14,7 +14,7 @@ namespace Content.Shared.Strip.Components
bool IDragDropOn.CanDragDropOn(DragDropEvent eventArgs)
{
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Dragged.Uid, out SharedStrippableComponent? strippable)) return false;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(eventArgs.Dragged, out SharedStrippableComponent? strippable)) return false;
return strippable.CanBeStripped(Owner);
}