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

6
Content.Server/Disposal/Unit/Components/DisposalHolderComponent.cs
View File

@@ -84,8 +84,8 @@ namespace Content.Server.Disposal.Unit.Components
return false;
}
return IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity.Uid) ||
IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity.Uid);
return IoCManager.Resolve<IEntityManager>().HasComponent<ItemComponent>(entity) ||
IoCManager.Resolve<IEntityManager>().HasComponent<SharedBodyComponent>(entity);
}
public bool TryInsert(IEntity entity)
@@ -95,7 +95,7 @@ namespace Content.Server.Disposal.Unit.Components
return false;
}
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out IPhysBody? physics))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out IPhysBody? physics))
{
physics.CanCollide = false;
}

8
Content.Server/Disposal/Unit/Components/DisposalUnitComponent.cs
View File

@@ -75,7 +75,7 @@ namespace Content.Server.Disposal.Unit.Components
[ViewVariables]
public bool Powered =>
!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out ApcPowerReceiverComponent? receiver) ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out ApcPowerReceiverComponent? receiver) ||
receiver.Powered;
[ViewVariables] public PressureState State => Pressure >= 1 ? PressureState.Ready : PressureState.Pressurizing;
@@ -97,8 +97,8 @@ namespace Content.Server.Disposal.Unit.Components
var actionBlocker = EntitySystem.Get<ActionBlockerSystem>();
if (!actionBlocker.CanInteract(player.Uid) ||
!actionBlocker.CanUse(player.Uid))
if (!actionBlocker.CanInteract(player) ||
!actionBlocker.CanUse(player))
{
return false;
}
@@ -149,7 +149,7 @@ namespace Content.Server.Disposal.Unit.Components
public override bool DragDropOn(DragDropEvent eventArgs)
{
EntitySystem.Get<DisposalUnitSystem>().TryInsert(Owner.Uid, eventArgs.Dragged.Uid, eventArgs.User.Uid);
EntitySystem.Get<DisposalUnitSystem>().TryInsert(Owner, eventArgs.Dragged, eventArgs.User);
return true;
}