tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bugfix] Fix Cross Grid Magboots (#39910)

Browse Source 
* 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>
This commit is contained in:
Princess Cheeseballs
2025-08-27 07:26:32 -07:00
committed by GitHub
parent cfb13f98e1
commit 36c9f2006d
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Shared/Clothing/MagbootsSystem.cs
View File

@@ -52,7 +52,7 @@ public sealed class SharedMagbootsSystem : EntitySystem
if (TryComp<MovedByPressureComponent>(user, out var moved)) if (TryComp<MovedByPressureComponent>(user, out var moved))
moved.Enabled = !state; moved.Enabled = !state;
_gravity.RefreshWeightless(user, !state); _gravity.RefreshWeightless(user);
if (state) if (state)
_alerts.ShowAlert(user, ent.Comp.MagbootsAlert); _alerts.ShowAlert(user, ent.Comp.MagbootsAlert);

2
Content.Shared/Gravity/GravityAffectedComponent.cs
View File

@@ -12,6 +12,6 @@ public sealed partial class GravityAffectedComponent : Component
/// <summary> /// <summary>
/// If true, this entity will be considered "weightless" /// If true, this entity will be considered "weightless"
/// </summary> /// </summary>
[DataField, AutoNetworkedField] [ViewVariables, AutoNetworkedField]
public bool Weightless = true; public bool Weightless = true;
} }

5
Content.Shared/Gravity/SharedGravitySystem.cs
View File

@@ -92,7 +92,8 @@ public abstract partial class SharedGravitySystem : EntitySystem
/// <summary> /// <summary>
/// Overload of <see cref="RefreshWeightless(Entity{GravityAffectedComponent?})"/> which also takes a bool for the weightlessness value we want to change to. /// Overload of <see cref="RefreshWeightless(Entity{GravityAffectedComponent?})"/> 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.
/// </summary> /// </summary>
/// <param name="entity">The entity we are updating the weightless status of</param> /// <param name="entity">The entity we are updating the weightless status of</param>
/// <param name="weightless">The weightless value we are trying to change to, helps avoid needless networking</param> /// <param name="weightless">The weightless value we are trying to change to, helps avoid needless networking</param>
@@ -142,7 +143,7 @@ public abstract partial class SharedGravitySystem : EntitySystem
if (args.OldParent == args.Transform.GridUid) if (args.OldParent == args.Transform.GridUid)
return; return;
RefreshWeightless((entity.Owner, entity.Comp), !EntityGridOrMapHaveGravity((entity, args.Transform))); RefreshWeightless((entity.Owner, entity.Comp));
} }
private void OnBodyTypeChanged(Entity<GravityAffectedComponent> entity, ref PhysicsBodyTypeChangedEvent args) private void OnBodyTypeChanged(Entity<GravityAffectedComponent> entity, ref PhysicsBodyTypeChangedEvent args)