tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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.Client/Verbs/VerbSystem.cs
View File

@@ -140,7 +140,7 @@ namespace Content.Client.Verbs
{
foreach (var entity in entities.ToList())
{
if (!EntityManager.TryGetComponent(entity.Uid, out ISpriteComponent? spriteComponent) ||
if (!EntityManager.TryGetComponent(entity, out ISpriteComponent? spriteComponent) ||
!spriteComponent.Visible)
{
entities.Remove(entity);
@@ -155,12 +155,12 @@ namespace Content.Client.Verbs
// Remove any entities that do not have LOS
if ((visibility & MenuVisibility.NoFov) == 0)
{
var playerPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player.Uid).MapPosition;
var playerPos = IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(player).MapPosition;
foreach (var entity in entities.ToList())
{
if (!ExamineSystemShared.InRangeUnOccluded(
playerPos,
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity.Uid).MapPosition,
IoCManager.Resolve<IEntityManager>().GetComponent<TransformComponent>(entity).MapPosition,
ExamineSystemShared.ExamineRange,
null))
{
@@ -182,9 +182,9 @@ namespace Content.Client.Verbs
/// </summary>
public Dictionary<VerbType, SortedSet<Verb>> GetVerbs(IEntity target, IEntity user, VerbType verbTypes)
{
if (!target.Uid.IsClientSide())
if (!target.IsClientSide())
{
RaiseNetworkEvent(new RequestServerVerbsEvent(target.Uid, verbTypes));
RaiseNetworkEvent(new RequestServerVerbsEvent(target, verbTypes));
}
return GetLocalVerbs(target, user, verbTypes);