From 38f67722af94a03079d9369721beee23285633e2 Mon Sep 17 00:00:00 2001 From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sat, 4 Jun 2022 13:26:06 +1200 Subject: [PATCH] Fix nullable error (#8632) --- .../Movement/Components/MovementIgnoreGravityComponent.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs index 6e6499927b..0ff9abf896 100644 --- a/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs +++ b/Content.Shared/Movement/Components/MovementIgnoreGravityComponent.cs @@ -38,8 +38,11 @@ namespace Content.Shared.Movement.Components if (body == null) entityManager.TryGetComponent(entity, out body); - if (entityManager.TryGetComponent(entity, out var ignoreGravityComponent) || - (body?.BodyType & (BodyType.Static | BodyType.Kinematic)) != 0) return ignoreGravityComponent.Weightless; + if ((body?.BodyType & (BodyType.Static | BodyType.Kinematic)) != 0) + return false; + + if (entityManager.TryGetComponent(entity, out var ignoreGravityComponent)) + return ignoreGravityComponent.Weightless; var transform = entityManager.GetComponent(entity); var gridId = transform.GridID;