Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

10
Content.Server/Hands/Systems/HandVirtualItemSystem.cs
View File

@@ -32,9 +32,9 @@ namespace Content.Server.Hands.Systems
if (!hand.IsEmpty)
continue;
var pos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(hands.Owner.Uid).Coordinates;
var pos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(hands.Owner).Coordinates;
var virtualItem = EntityManager.SpawnEntity("HandVirtualItem", pos);
var virtualItemComp = IoCManager.Resolve<IEntityManager>().GetComponent<HandVirtualItemComponent>(virtualItem.Uid);
var virtualItemComp = IoCManager.Resolve<IEntityManager>().GetComponent<HandVirtualItemComponent>(virtualItem);
virtualItemComp.BlockingEntity = blockingEnt;
hands.PutEntityIntoHand(hand, virtualItem);
return true;
@@ -56,7 +56,7 @@ namespace Content.Server.Hands.Systems
// If the virtual item gets removed from the hands for any reason, cancel the pull and delete it.
private void HandleItemUnequipped(EntityUid uid, HandVirtualItemComponent component, UnequippedHandEvent args)
{
Delete(component, args.User.Uid);
Delete(component, args.User);
}
private void HandleItemDropped(EntityUid uid, HandVirtualItemComponent component, DroppedEvent args)
@@ -74,7 +74,7 @@ namespace Content.Server.Hands.Systems
var targEv = new VirtualItemDeletedEvent(comp.BlockingEntity, user);
RaiseLocalEvent(comp.BlockingEntity, targEv, false);
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity(comp.Owner.Uid);
IoCManager.Resolve<IEntityManager>().QueueDeleteEntity((EntityUid) comp.Owner);
}
/// <summary>
@@ -93,7 +93,7 @@ namespace Content.Server.Hands.Systems
if (hand.HeldEntity != null)
{
if (EntityManager.TryGetComponent<HandVirtualItemComponent>(hand.HeldEntity.Uid,
if (EntityManager.TryGetComponent<HandVirtualItemComponent>(hand.HeldEntity,
out var virt)
&& virt.BlockingEntity == matching)
{