From 04cb1d63ddd64d76a6aacb9a6780293fb0ec469c Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Mon, 25 Jul 2022 16:55:24 +1000 Subject: [PATCH] Fix gravity mispredict (#10017) --- Content.Server/Gravity/EntitySystems/GravitySystem.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Content.Server/Gravity/EntitySystems/GravitySystem.cs b/Content.Server/Gravity/EntitySystems/GravitySystem.cs index be0ad2f851..d1ecabc370 100644 --- a/Content.Server/Gravity/EntitySystems/GravitySystem.cs +++ b/Content.Server/Gravity/EntitySystems/GravitySystem.cs @@ -46,21 +46,28 @@ namespace Content.Server.Gravity.EntitySystems public void EnableGravity(GravityComponent comp) { - if (comp.Enabled) return; + if (comp.Enabled) + return; var gridId = Transform(comp.Owner).GridUid; + Dirty(comp); + if (gridId == null) return; comp.Enabled = true; var message = new GravityChangedEvent(gridId.Value, true); RaiseLocalEvent(message); + } public void DisableGravity(GravityComponent comp) { - if (!comp.Enabled) return; + if (!comp.Enabled) + return; + comp.Enabled = false; + Dirty(comp); var gridId = Transform(comp.Owner).GridUid; if (gridId == null)