From 36c9f2006d62d90555ca9ecf05c1c700868a8872 Mon Sep 17 00:00:00 2001 From: Princess Cheeseballs <66055347+Princess-Cheeseballs@users.noreply.github.com> Date: Wed, 27 Aug 2025 07:26:32 -0700 Subject: [PATCH] [Bugfix] Fix Cross Grid Magboots (#39910) * Augh * Remove that * ViewVariables property so it can be debugged at the very least. * Remove --------- Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com> --- Content.Shared/Clothing/MagbootsSystem.cs | 2 +- Content.Shared/Gravity/GravityAffectedComponent.cs | 2 +- Content.Shared/Gravity/SharedGravitySystem.cs | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Content.Shared/Clothing/MagbootsSystem.cs b/Content.Shared/Clothing/MagbootsSystem.cs index 58bc2f0796..d00211fa65 100644 --- a/Content.Shared/Clothing/MagbootsSystem.cs +++ b/Content.Shared/Clothing/MagbootsSystem.cs @@ -52,7 +52,7 @@ public sealed class SharedMagbootsSystem : EntitySystem if (TryComp(user, out var moved)) moved.Enabled = !state; - _gravity.RefreshWeightless(user, !state); + _gravity.RefreshWeightless(user); if (state) _alerts.ShowAlert(user, ent.Comp.MagbootsAlert); diff --git a/Content.Shared/Gravity/GravityAffectedComponent.cs b/Content.Shared/Gravity/GravityAffectedComponent.cs index 2da7458b07..7991677759 100644 --- a/Content.Shared/Gravity/GravityAffectedComponent.cs +++ b/Content.Shared/Gravity/GravityAffectedComponent.cs @@ -12,6 +12,6 @@ public sealed partial class GravityAffectedComponent : Component /// /// If true, this entity will be considered "weightless" /// - [DataField, AutoNetworkedField] + [ViewVariables, AutoNetworkedField] public bool Weightless = true; } diff --git a/Content.Shared/Gravity/SharedGravitySystem.cs b/Content.Shared/Gravity/SharedGravitySystem.cs index b54f9b21c8..4ba312f4e0 100644 --- a/Content.Shared/Gravity/SharedGravitySystem.cs +++ b/Content.Shared/Gravity/SharedGravitySystem.cs @@ -92,7 +92,8 @@ public abstract partial class SharedGravitySystem : EntitySystem /// /// Overload of which also takes a bool for the weightlessness value we want to change to. - /// This method is LOAD BEARING for UninitializedSaveTest. DO NOT REMOVE IT. + /// This method should only be called if there is no chance something can override the weightless value you're trying to change to. + /// This is really only the case if you're applying a weightless value that overrides non-conditionally from events or are a grid with the gravity component. /// /// The entity we are updating the weightless status of /// The weightless value we are trying to change to, helps avoid needless networking @@ -142,7 +143,7 @@ public abstract partial class SharedGravitySystem : EntitySystem if (args.OldParent == args.Transform.GridUid) return; - RefreshWeightless((entity.Owner, entity.Comp), !EntityGridOrMapHaveGravity((entity, args.Transform))); + RefreshWeightless((entity.Owner, entity.Comp)); } private void OnBodyTypeChanged(Entity entity, ref PhysicsBodyTypeChangedEvent args) -- 2.51.2