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

Remove 700 usages of Component.Owner (#21100)

Browse Source
This commit is contained in:
DrSmugleaf
2023-10-19 12:34:31 -07:00
committed by GitHub
parent 5825ffb95c
commit f560f88eb5
261 changed files with 2291 additions and 2036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,3 @@
using System.Collections.Generic;
using Content.Client.HealthOverlay.UI;
using Content.Shared.Damage;
using Content.Shared.GameTicking;
@@ -6,8 +5,6 @@ using Content.Shared.Mobs.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
namespace Content.Client.HealthOverlay
{
@@ -80,10 +77,9 @@ namespace Content.Client.HealthOverlay
var viewBox = _eyeManager.GetWorldViewport().Enlarged(2.0f);
foreach (var (mobState, _) in EntityManager.EntityQuery<MobStateComponent, DamageableComponent>())
var query = EntityQueryEnumerator<MobStateComponent, DamageableComponent>();
while (query.MoveNext(out var entity, out var mobState, out _))
{
var entity = mobState.Owner;
if (_entities.GetComponent<TransformComponent>(ent).MapID != _entities.GetComponent<TransformComponent>(entity).MapID ||
!viewBox.Contains(_entities.GetComponent<TransformComponent>(entity).WorldPosition))
{

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

@@ -70,7 +70,7 @@ namespace Content.Client.HealthOverlay.UI
Panel.Visible = val;
}
private void MoreFrameUpdate(FrameEventArgs args)
private void MoreFrameUpdate()
{
if (_entities.Deleted(Entity))
{
@@ -87,7 +87,7 @@ namespace Content.Client.HealthOverlay.UI
var mobStateSystem = _entities.EntitySysManager.GetEntitySystem<MobStateSystem>();
var mobThresholdSystem = _entities.EntitySysManager.GetEntitySystem<MobThresholdSystem>();
if (mobStateSystem.IsAlive(mobState.Owner, mobState))
if (mobStateSystem.IsAlive(Entity, mobState))
{
if (!mobThresholdSystem.TryGetThresholdForState(Entity,MobState.Critical, out var threshold))
{
@@ -101,7 +101,7 @@ namespace Content.Client.HealthOverlay.UI
HealthBar.Ratio = 1 - ((FixedPoint2)(damageable.TotalDamage / threshold)).Float();
HealthBar.Visible = true;
}
else if (mobStateSystem.IsCritical(mobState.Owner, mobState))
else if (mobStateSystem.IsCritical(Entity, mobState))
{
HealthBar.Ratio = 0;
HealthBar.Visible = false;
@@ -118,7 +118,7 @@ namespace Content.Client.HealthOverlay.UI
((damageable.TotalDamage - critThreshold) /
(deadThreshold - critThreshold)).Value.Float();
}
else if (mobStateSystem.IsDead(mobState.Owner, mobState))
else if (mobStateSystem.IsDead(Entity, mobState))
{
CritBar.Ratio = 0;
CritBar.Visible = false;
@@ -136,7 +136,7 @@ namespace Content.Client.HealthOverlay.UI
{
base.FrameUpdate(args);
MoreFrameUpdate(args);
MoreFrameUpdate();
if (_entities.Deleted(Entity) || _eyeManager.CurrentMap != _entities.GetComponent<TransformComponent>(Entity).MapID)
{