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

Fix weird lifestage autorefactors.

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-09 12:29:27 +01:00
parent 3a9e1ff929
commit 8b09d55b10
43 changed files with 55 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,7 +73,7 @@ namespace Content.Client.HealthOverlay
return;
}
if (_attachedEntity == null || (!_entities.EntityExists(_attachedEntity.Value) ? EntityLifeStage.Deleted : _entities.GetComponent<MetaDataComponent>(_attachedEntity.Value).EntityLifeStage) >= EntityLifeStage.Deleted)
if (_attachedEntity is not {} ent || Deleted(ent))
{
return;
}
@@ -84,7 +84,7 @@ namespace Content.Client.HealthOverlay
{
var entity = mobState.Owner;
if (_entities.GetComponent<TransformComponent>(_attachedEntity.Value).MapID != _entities.GetComponent<TransformComponent>(entity).MapID ||
if (_entities.GetComponent<TransformComponent>(ent).MapID != _entities.GetComponent<TransformComponent>(entity).MapID ||
!viewBox.Contains(_entities.GetComponent<TransformComponent>(entity).WorldPosition))
{
if (_guis.TryGetValue(entity, out var oldGui))

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

@@ -73,7 +73,7 @@ namespace Content.Client.HealthOverlay.UI
private void MoreFrameUpdate(FrameEventArgs args)
{
if ((!_entities.EntityExists(Entity) ? EntityLifeStage.Deleted : _entities.GetComponent<MetaDataComponent>(Entity).EntityLifeStage) >= EntityLifeStage.Deleted)
if (_entities.Deleted(Entity))
{
return;
}
@@ -139,8 +139,7 @@ namespace Content.Client.HealthOverlay.UI
MoreFrameUpdate(args);
if ((!_entities.EntityExists(Entity) ? EntityLifeStage.Deleted : _entities.GetComponent<MetaDataComponent>(Entity).EntityLifeStage) >= EntityLifeStage.Deleted ||
_eyeManager.CurrentMap != _entities.GetComponent<TransformComponent>(Entity).MapID)
if (_entities.Deleted(Entity) || _eyeManager.CurrentMap != _entities.GetComponent<TransformComponent>(Entity).MapID)
{
Visible = false;
return;