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

Got rid of some IEntities

Browse Source
This commit is contained in:
Wrexbe
2021-12-03 11:15:41 -08:00
parent f5b8bb3731
commit e2d7ea6f62
7 changed files with 81 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Client/Buckle/BuckleComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.Buckle.Components;
using Content.Shared.Buckle.Components;
using Robust.Client.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
@@ -14,7 +14,7 @@ namespace Content.Client.Buckle
public override bool Buckled => _buckled;
public override bool TryBuckle(IEntity? user, IEntity to)
public override bool TryBuckle(EntityUid user, EntityUid to)
{
// TODO: Prediction
return false;
@@ -30,8 +30,7 @@ namespace Content.Client.Buckle
_buckled = buckle.Buckled;
LastEntityBuckledTo = buckle.LastEntityBuckledTo;
DontCollide = buckle.DontCollide;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner, out SpriteComponent? ownerSprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(OwnerUid, out SpriteComponent? ownerSprite))
{
return;
}

13
Content.Client/CharacterAppearance/Systems/HumanoidAppearanceSystem.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Client.CharacterAppearance.Systems
{
foreach (var (part, _) in body.Parts)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(part.Owner, out SpriteComponent? partSprite))
if (EntityManager.TryGetComponent(part.OwnerUid, out SpriteComponent? partSprite))
{
partSprite!.Color = component.Appearance.SkinColor;
}
@@ -107,13 +107,13 @@ namespace Content.Client.CharacterAppearance.Systems
// Scaffolding until Body is moved to ECS.
private void BodyPartAdded(HumanoidAppearanceBodyPartAddedEvent args)
{
if(!EntityManager.TryGetEntity(args.Uid, out var owner)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SpriteComponent? sprite))
var entityManager = IoCManager.Resolve<IEntityManager>();
if (!entityManager.TryGetComponent(args.Uid, out SpriteComponent? sprite))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SpriteComponent>(args.Args.Part.Owner))
if (!entityManager.HasComponent<SpriteComponent>(args.Args.Part.OwnerUid))
{
return;
}
@@ -131,13 +131,12 @@ namespace Content.Client.CharacterAppearance.Systems
private void BodyPartRemoved(HumanoidAppearanceBodyPartRemovedEvent args)
{
if(!EntityManager.TryGetEntity(args.Uid, out var owner)) return;
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(owner, out SpriteComponent? sprite))
if (!EntityManager.TryGetComponent(args.Uid, out SpriteComponent? sprite))
{
return;
}
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SpriteComponent>(args.Args.Part.Owner))
if (!EntityManager.HasComponent<SpriteComponent>(args.Args.Part.OwnerUid))
{
return;
}

10
Content.Client/Ghost/GhostSystem.cs
View File

@@ -1,4 +1,4 @@
using Content.Client.Ghost.UI;
using Content.Client.Ghost.UI;
using Content.Client.HUD;
using Content.Shared.Ghost;
using JetBrains.Annotations;
@@ -36,7 +36,7 @@ namespace Content.Client.Ghost
foreach (var ghost in EntityManager.GetAllComponents(typeof(GhostComponent), true))
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(ghost.Owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(ghost.OwnerUid, out SpriteComponent? sprite))
{
sprite.Visible = value;
}
@@ -60,7 +60,7 @@ namespace Content.Client.Ghost
private void OnGhostInit(EntityUid uid, GhostComponent component, ComponentInit args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(component.Owner, out SpriteComponent? sprite))
if (EntityManager.TryGetComponent(component.OwnerUid, out SpriteComponent? sprite))
{
sprite.Visible = GhostVisibility;
}
@@ -101,10 +101,10 @@ namespace Content.Client.Ghost
private void OnGhostWarpsResponse(GhostWarpsResponseEvent msg)
{
var entity = _playerManager.LocalPlayer?.ControlledEntity;
var entity = _playerManager.LocalPlayer?.ControlledEntity?.Uid;
if (entity == null ||
!IoCManager.Resolve<IEntityManager>().TryGetComponent(entity, out GhostComponent? ghost))
!EntityManager.TryGetComponent(entity.Value, out GhostComponent? ghost))
{
return;
}