juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix thrusters not dealing damage (#35088)

Browse Source 
* Fix thrusters not dealing damage

* Fixes

* Update

* Update

* Update
This commit is contained in:
Winkarst
2025-02-13 22:27:33 +03:00
committed by GitHub
parent eb8b265238
commit 0c4e8f6b86
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Shuttles/Systems/ThrusterSystem.cs
View File

@@ -232,6 +232,8 @@ public sealed class ThrusterSystem : EntitySystem
private void OnThrusterInit(EntityUid uid, ThrusterComponent component, ComponentInit args)
{
component.NextFire = _timing.CurTime + component.FireCooldown;
_ambient.SetAmbience(uid, false);
if (!component.Enabled)
@@ -461,10 +463,13 @@ public sealed class ThrusterSystem : EntitySystem
while (query.MoveNext(out var comp))
{
if (!comp.Firing || comp.Colliding.Count == 0 || comp.Damage == null || comp.NextFire < curTime)
if (comp.NextFire > curTime)
continue;
comp.NextFire += TimeSpan.FromSeconds(1);
comp.NextFire += comp.FireCooldown;
if (!comp.Firing || comp.Colliding.Count == 0 || comp.Damage == null)
continue;
foreach (var uid in comp.Colliding.ToArray())
{