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

Inline Deleted

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:30:03 +01:00
parent 149707a566
commit b2035543e2
60 changed files with 94 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/HealthOverlay/HealthOverlaySystem.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Client.HealthOverlay
return;
}
if (_attachedEntity == null || _attachedEntity.Deleted)
if (_attachedEntity == null || (!IoCManager.Resolve<IEntityManager>().EntityExists(_attachedEntity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(_attachedEntity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted)
{
return;
}

4
Content.Client/HealthOverlay/UI/HealthOverlayGui.cs
View File

@@ -72,7 +72,7 @@ namespace Content.Client.HealthOverlay.UI
private void MoreFrameUpdate(FrameEventArgs args)
{
if (Entity.Deleted)
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted)
{
return;
}
@@ -138,7 +138,7 @@ namespace Content.Client.HealthOverlay.UI
MoreFrameUpdate(args);
if (Entity.Deleted ||
if ((!IoCManager.Resolve<IEntityManager>().EntityExists(Entity.Uid) ? EntityLifeStage.Deleted : IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(Entity.Uid).EntityLifeStage) >= EntityLifeStage.Deleted ||
_eyeManager.CurrentMap != Entity.Transform.MapID)
{
Visible = false;