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

Inline HasComponent entirely

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 12:23:18 +01:00
parent 88141ae6b8
commit 0feebbff00
117 changed files with 201 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ namespace Content.Client.CharacterAppearance.Systems
return;
}
if (!args.Args.Part.Owner.HasComponent<SpriteComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SpriteComponent>(args.Args.Part.Owner.Uid))
{
return;
}
@@ -137,7 +137,7 @@ namespace Content.Client.CharacterAppearance.Systems
return;
}
if (!args.Args.Part.Owner.HasComponent<SpriteComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SpriteComponent>(args.Args.Part.Owner.Uid))
{
return;
}

2
Content.Client/Chat/Managers/ChatManager.cs
View File

@@ -231,7 +231,7 @@ namespace Content.Client.Chat.Managers
ChatPermissionsUpdated?.Invoke(new ChatPermissionsUpdatedEventArgs {OldSelectableChannels = oldSelectable});
}
public bool IsGhost => _playerManager.LocalPlayer?.ControlledEntity?.HasComponent<GhostComponent>() ?? false;
public bool IsGhost => _playerManager.LocalPlayer?.ControlledEntityUid is {} uid && _entityManager.HasComponent<GhostComponent>(uid);
public void FrameUpdate(FrameEventArgs delta)
{

2
Content.Client/Damage/DamageVisualizer.cs
View File

@@ -293,7 +293,7 @@ namespace Content.Client.Damage
{
if (!entity.TryGetComponent<SpriteComponent>(out SpriteComponent? spriteComponent)
|| !entity.TryGetComponent<DamageableComponent>(out var damageComponent)
|| !entity.HasComponent<AppearanceComponent>())
|| !IoCManager.Resolve<IEntityManager>().HasComponent<AppearanceComponent>(entity.Uid))
return;
_thresholds.Add(FixedPoint2.Zero);

2
Content.Client/Disposal/Visualizers/DisposalVisualizer.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Client.Disposal.Visualizers
{
appearance.Owner.EnsureComponent<SubFloorHideComponent>();
}
else if (appearance.Owner.HasComponent<SubFloorHideComponent>())
else if (IoCManager.Resolve<IEntityManager>().HasComponent<SubFloorHideComponent>(appearance.Owner.Uid))
{
IoCManager.Resolve<IEntityManager>().RemoveComponent<SubFloorHideComponent>(appearance.Owner.Uid);
}

2
Content.Client/Doors/AirlockVisualizer.cs
View File

@@ -112,7 +112,7 @@ namespace Content.Client.Doors
public override void InitializeEntity(IEntity entity)
{
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}

2
Content.Client/Hands/HandsGui.xaml.cs
View File

@@ -100,7 +100,7 @@ namespace Content.Client.Hands
// Show blocked overlay if hand is blocked.
newButton.Blocked.Visible =
hand.HeldItem != null && hand.HeldItem.HasComponent<HandVirtualItemComponent>();
hand.HeldItem != null && IoCManager.Resolve<IEntityManager>().HasComponent<HandVirtualItemComponent>(hand.HeldItem.Uid);
}
if (TryGetActiveHand(out var activeHand))

2
Content.Client/Hands/ShowHandItemOverlay.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.Hands
var sys = EntitySystem.Get<HandsSystem>();
var handEntity = sys.GetActiveHandEntity();
if (handEntity == null || !_cfg.GetCVar(CCVars.HudHeldItemShow) || !handEntity.HasComponent<ISpriteComponent>())
if (handEntity == null || !_cfg.GetCVar(CCVars.HudHeldItemShow) || !IoCManager.Resolve<IEntityManager>().HasComponent<ISpriteComponent>(handEntity.Uid))
return;
var screen = args.ScreenHandle;

4
Content.Client/Items/Managers/ItemSlotManager.cs
View File

@@ -54,7 +54,7 @@ namespace Content.Client.Items.Managers
button.ClearHover();
button.SpriteView.Sprite = sprite;
button.StorageButton.Visible = entity.HasComponent<ClientStorageComponent>();
button.StorageButton.Visible = IoCManager.Resolve<IEntityManager>().HasComponent<ClientStorageComponent>(entity.Uid);
}
button.Entity = entity?.Uid ?? default;
@@ -132,7 +132,7 @@ namespace Content.Client.Items.Managers
return;
}
if (!entity.HasComponent<SpriteComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<SpriteComponent>(entity.Uid))
{
return;
}

2
Content.Client/Lathe/Visualizers/AutolatheVisualizer.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Client.Lathe.Visualizers
public override void InitializeEntity(IEntity entity)
{
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}

2
Content.Client/Lathe/Visualizers/ProtolatheVisualizer.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Client.Lathe.Visualizers
public override void InitializeEntity(IEntity entity)
{
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}

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

@@ -56,7 +56,7 @@ namespace Content.Client.Physics.Controllers
var pulling = pullerComp.Pulling;
if (pulling != null &&
pulling.HasComponent<MobStateComponent>() &&
IoCManager.Resolve<IEntityManager>().HasComponent<MobStateComponent>(pulling.Uid) &&
pulling.TryGetComponent(out PhysicsComponent? pullingBody))
{
pullingBody.Predict = false;

2
Content.Client/Singularity/Visualizers/RadiationCollectorVisualizer.cs
View File

@@ -46,7 +46,7 @@ namespace Content.Client.Singularity.Visualizers
public override void InitializeEntity(IEntity entity)
{
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}

2
Content.Client/Trigger/TimerTriggerVisualizer.cs
View File

@@ -38,7 +38,7 @@ namespace Content.Client.Trigger
public override void InitializeEntity(IEntity entity)
{
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}

2
Content.Client/VendingMachines/UI/VendingMachineVisualizer.cs
View File

@@ -121,7 +121,7 @@ namespace Content.Client.VendingMachines.UI
{
base.InitializeEntity(entity);
if (!entity.HasComponent<AnimationPlayerComponent>())
if (!IoCManager.Resolve<IEntityManager>().HasComponent<AnimationPlayerComponent>(entity.Uid))
{
IoCManager.Resolve<IEntityManager>().AddComponent<AnimationPlayerComponent>(entity);
}