Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix jet in zero gravity #1512

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Fix jet in zero gravity #1512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Content.Shared/Movement/Systems/SharedJetpackSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,15 @@ private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJe

private bool CanEnableOnGrid(EntityUid? gridUid)
{
return gridUid == null ||
(!HasComp<GravityComponent>(gridUid));
//return gridUid == null ||
// (!HasComp<GravityComponent>(gridUid)); //SS220 Convert to comment

//SS220 Fix jet in zero gravity begin
if (gridUid == null || !TryComp<GravityComponent>(gridUid, out var comp))
return true;

return !comp.Enabled;
//SS220 Fix jet in zero gravity end
}

private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args)
Expand Down
Loading