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

Turn off gravity on remove (#8446)

Browse Source
This commit is contained in:
wrexbe
2022-05-25 13:17:56 -07:00
committed by GitHub
parent ba3653c218
commit efedb3d7ba
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/Gravity/EntitySystems/GravityGeneratorSystem.cs
View File

@@ -20,11 +20,18 @@ namespace Content.Server.Gravity.EntitySystems
base.Initialize(); base.Initialize();
SubscribeLocalEvent<GravityGeneratorComponent, ComponentInit>(OnComponentInitialized); SubscribeLocalEvent<GravityGeneratorComponent, ComponentInit>(OnComponentInitialized);
SubscribeLocalEvent<GravityGeneratorComponent, ComponentShutdown>(OnComponentShutdown);
SubscribeLocalEvent<GravityGeneratorComponent, InteractHandEvent>(OnInteractHand); SubscribeLocalEvent<GravityGeneratorComponent, InteractHandEvent>(OnInteractHand);
SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>( SubscribeLocalEvent<GravityGeneratorComponent, SharedGravityGeneratorComponent.SwitchGeneratorMessage>(
OnSwitchGenerator); OnSwitchGenerator);
} }
private void OnComponentShutdown(EntityUid uid, GravityGeneratorComponent component, ComponentShutdown args)
{
component.GravityActive = false;
UpdateGravityActive(component, true);
}
public override void Update(float frameTime) public override void Update(float frameTime)
{ {
base.Update(frameTime); base.Update(frameTime);

6
Content.Server/Gravity/EntitySystems/GravitySystem.cs
View File

@@ -10,6 +10,7 @@ namespace Content.Server.Gravity.EntitySystems
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<GravityComponent, ComponentInit>(HandleGravityInitialize); SubscribeLocalEvent<GravityComponent, ComponentInit>(HandleGravityInitialize);
SubscribeLocalEvent<GravityComponent, ComponentShutdown>(HandleGravityShutdown);
} }
private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args) private void HandleGravityInitialize(EntityUid uid, GravityComponent component, ComponentInit args)
@@ -34,6 +35,11 @@ namespace Content.Server.Gravity.EntitySystems
RaiseLocalEvent(message); RaiseLocalEvent(message);
} }
private void HandleGravityShutdown(EntityUid uid, GravityComponent component, ComponentShutdown args)
{
DisableGravity(component);
}
public void EnableGravity(GravityComponent comp) public void EnableGravity(GravityComponent comp)
{ {
if (comp.Enabled) return; if (comp.Enabled) return;