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

Inline TryGetComponent completely, for real

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 14:17:01 +01:00
parent 2ff4ec65d5
commit 69b270017b
425 changed files with 1143 additions and 995 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Weapons/Melee/Components/MeleeLungeComponent.cs
View File

@@ -39,7 +39,7 @@ namespace Content.Client.Weapons.Melee.Components
offset *= (ResetTime - _time) / ResetTime;
}
if (Owner.TryGetComponent(out ISpriteComponent? spriteComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(Owner.Uid, out ISpriteComponent? spriteComponent))
{
spriteComponent.Offset = offset;
}

4
Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
View File

@@ -65,7 +65,7 @@ namespace Content.Client.Weapons.Melee
// Due to ISpriteComponent limitations, weapons that don't use an RSI won't have this effect.
if (EntityManager.TryGetEntity(msg.Source, out var source) &&
msg.TextureEffect &&
source.TryGetComponent(out ISpriteComponent? sourceSprite) &&
IoCManager.Resolve<IEntityManager>().TryGetComponent(source.Uid, out ISpriteComponent? sourceSprite) &&
sourceSprite.BaseRSI?.Path != null)
{
var curTime = _gameTiming.CurTime;
@@ -93,7 +93,7 @@ namespace Content.Client.Weapons.Melee
continue;
}
if (!hitEntity.TryGetComponent(out ISpriteComponent? sprite))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(hitEntity.Uid, out ISpriteComponent? sprite))
{
continue;
}

4
Content.Client/Weapons/Ranged/RangedWeaponSystem.cs
View File

@@ -48,12 +48,12 @@ namespace Content.Client.Weapons.Ranged
}
var entity = _playerManager.LocalPlayer?.ControlledEntity;
if (entity == null || !entity.TryGetComponent(out SharedHandsComponent? hands))
if (entity == null || !IoCManager.Resolve<IEntityManager>().TryGetComponent(entity.Uid, out SharedHandsComponent? hands))
{
return;
}
if (!hands.TryGetActiveHeldEntity(out var held) || !held.TryGetComponent(out ClientRangedWeaponComponent? weapon))
if (!hands.TryGetActiveHeldEntity(out var held) || !IoCManager.Resolve<IEntityManager>().TryGetComponent(held.Uid, out ClientRangedWeaponComponent? weapon))
{
_blocked = true;
return;