Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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.Server/Gravity/EntitySystems/GravityShakeSystem.cs
View File

@@ -81,7 +81,7 @@ namespace Content.Server.Gravity.EntitySystems
{
if (player.AttachedEntity == null
|| player.AttachedEntity.Transform.GridID != gridId
|| !player.AttachedEntity.TryGetComponent(out CameraRecoilComponent? recoil))
|| !IoCManager.Resolve<IEntityManager>().TryGetComponent(player.AttachedEntity.Uid, out CameraRecoilComponent? recoil))
{
continue;
}

4
Content.Server/Gravity/EntitySystems/WeightlessSystem.cs
View File

@@ -99,13 +99,13 @@ namespace Content.Server.Gravity.EntitySystems
private void EntParentChanged(ref EntParentChangedMessage ev)
{
if (!ev.Entity.TryGetComponent(out ServerAlertsComponent? status))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.Entity.Uid, out ServerAlertsComponent? status))
{
return;
}
if (ev.OldParent != null &&
ev.OldParent.TryGetComponent(out IMapGridComponent? mapGrid))
IoCManager.Resolve<IEntityManager>().TryGetComponent(ev.OldParent.Uid, out IMapGridComponent? mapGrid))
{
var oldGrid = mapGrid.GridIndex;