From da16c10dcc80c0e679467c424d580a528ed85e76 Mon Sep 17 00:00:00 2001 From: ScrawnyRonnie Date: Wed, 29 Nov 2023 14:47:03 -0500 Subject: [PATCH] keep jamming --- .../scala/net/psforever/objects/equipment/JammingUnit.scala | 2 +- .../net/psforever/objects/vehicles/control/VehicleControl.scala | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala b/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala index dfd1d601..ac33cae0 100644 --- a/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala +++ b/src/main/scala/net/psforever/objects/equipment/JammingUnit.scala @@ -253,7 +253,7 @@ trait JammableMountedWeapons extends JammableBehavior { override def StartJammeredStatus(target: Any, dur: Int): Unit = { target match { - case obj: PlanetSideServerObject with MountedWeapons with JammableUnit if !obj.Jammed => + case obj: PlanetSideServerObject with MountedWeapons with JammableUnit => JammableMountedWeaponsJammeredStatus(obj, statusCode = 1) super.StartJammeredStatus(target, dur) case _ => ; diff --git a/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala b/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala index 2cdbb12b..caf21001 100644 --- a/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala +++ b/src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala @@ -859,10 +859,8 @@ class VehicleControl(vehicle: Vehicle) override def StartJammeredStatus(target: Any, dur: Int): Unit = { super.StartJammeredStatus(target, dur) val subsystems = vehicle.Subsystems() - if (!subsystems.exists { _.Jammed }) { subsystems.foreach { _.jam() } vehicleSubsystemMessages(subsystems.flatMap { _.changedMessages(vehicle) }) - } } override def CancelJammeredStatus(target: Any): Unit = {