From 34c90cf2004388cee819fd71ea8e0f99470aef04 Mon Sep 17 00:00:00 2001 From: godisdeadLOL <169250097+godisdeadLOL@users.noreply.github.com> Date: Tue, 3 Sep 2024 03:50:34 +0300 Subject: [PATCH] Ninja throwing star ability fix (#31684) fixed ninja star not spawning Co-authored-by: YourUsername --- Content.Server/Ninja/Systems/NinjaGlovesSystem.cs | 1 + Content.Server/Ninja/Systems/NinjaSuitSystem.cs | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs index 3aaf7c5d58..ae7bb15fc4 100644 --- a/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs +++ b/Content.Server/Ninja/Systems/NinjaGlovesSystem.cs @@ -49,6 +49,7 @@ public sealed class NinjaGlovesSystem : SharedNinjaGlovesSystem { var ev = new NinjaBatteryChangedEvent(battery.Value, suit); RaiseLocalEvent(user, ref ev); + RaiseLocalEvent(suit, ref ev); } } } diff --git a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs index 63054eaad5..244b7adf03 100644 --- a/Content.Server/Ninja/Systems/NinjaSuitSystem.cs +++ b/Content.Server/Ninja/Systems/NinjaSuitSystem.cs @@ -37,6 +37,16 @@ public sealed class NinjaSuitSystem : SharedNinjaSuitSystem base.NinjaEquipped(ent, user); _ninja.SetSuitPowerAlert(user); + + // raise event to let ninja components get starting battery + _ninja.GetNinjaBattery(user.Owner, out var uid, out var _); + + if (uid is not {} battery_uid) + return; + + var ev = new NinjaBatteryChangedEvent(battery_uid, ent.Owner); + RaiseLocalEvent(ent, ref ev); + RaiseLocalEvent(user, ref ev); } // TODO: if/when battery is in shared, put this there too -- 2.51.2