tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove IMobStateComponent (#5220)

Browse Source
This commit is contained in:
Javier Guardia Fernández
2021-11-08 15:11:58 +01:00
committed by GitHub
parent 4236551d86
commit f5b11d6af8
35 changed files with 84 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@ using System.Collections.Generic;
using Content.Client.HealthOverlay.UI;
using Content.Shared.Damage;
using Content.Shared.GameTicking;
using Content.Shared.MobState;
using Content.Shared.MobState.Components;
using JetBrains.Annotations;
using Robust.Client.GameObjects;
using Robust.Client.Graphics;
@@ -79,7 +79,7 @@ namespace Content.Client.HealthOverlay
var viewBox = _eyeManager.GetWorldViewport().Enlarged(2.0f);
foreach (var (mobState, _) in EntityManager.EntityQuery<IMobStateComponent, DamageableComponent>())
foreach (var (mobState, _) in EntityManager.EntityQuery<MobStateComponent, DamageableComponent>())
{
var entity = mobState.Owner;

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

@@ -2,7 +2,7 @@ using Content.Client.IoC;
using Content.Client.Resources;
using Content.Shared.Damage;
using Content.Shared.FixedPoint;
using Content.Shared.MobState;
using Content.Shared.MobState.Components;
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
@@ -77,7 +77,7 @@ namespace Content.Client.HealthOverlay.UI
return;
}
if (!Entity.TryGetComponent(out IMobStateComponent? mobState) ||
if (!Entity.TryGetComponent(out MobStateComponent? mobState) ||
!Entity.TryGetComponent(out DamageableComponent? damageable))
{
CritBar.Visible = false;

4
Content.Client/MobState/Overlays/CritOverlay.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.MobState;
using Content.Shared.MobState.Components;
using Robust.Client.Graphics;
using Robust.Client.Player;
using Robust.Shared.Enums;
@@ -31,7 +31,7 @@ namespace Content.Client.MobState.Overlays
return false;
}
if (playerEntity.TryGetComponent<IMobStateComponent>(out var mobState))
if (playerEntity.TryGetComponent<MobStateComponent>(out var mobState))
{
if (critical)
if (mobState.IsCritical())

5
Content.Client/Physics/Controllers/MoverController.cs
View File

@@ -1,5 +1,4 @@
using Content.Shared.Body.Components;
using Content.Shared.MobState;
using Content.Shared.MobState.Components;
using Content.Shared.Movement;
using Content.Shared.Movement.Components;
using Content.Shared.Pulling.Components;
@@ -57,7 +56,7 @@ namespace Content.Client.Physics.Controllers
var pulling = pullerComp.Pulling;
if (pulling != null &&
pulling.HasComponent<IMobStateComponent>() &&
pulling.HasComponent<MobStateComponent>() &&
pulling.TryGetComponent(out PhysicsComponent? pullingBody))
{
pullingBody.Predict = false;