PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 23:14:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

keep jamming

Browse source
This commit is contained in:
ScrawnyRonnie 2023-11-29 14:47:03 -05:00
parent 5552d3469c
commit da16c10dcc
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/scala/net/psforever/objects/equipment/JammingUnit.scala
View file

@ -253,7 +253,7 @@ trait JammableMountedWeapons extends JammableBehavior {
override def StartJammeredStatus(target: Any, dur: Int): Unit = { override def StartJammeredStatus(target: Any, dur: Int): Unit = {
target match { target match {
case obj: PlanetSideServerObject with MountedWeapons with JammableUnit if !obj.Jammed => case obj: PlanetSideServerObject with MountedWeapons with JammableUnit =>
JammableMountedWeaponsJammeredStatus(obj, statusCode = 1) JammableMountedWeaponsJammeredStatus(obj, statusCode = 1)
super.StartJammeredStatus(target, dur) super.StartJammeredStatus(target, dur)
case _ => ; case _ => ;

2
src/main/scala/net/psforever/objects/vehicles/control/VehicleControl.scala
View file

@ -859,10 +859,8 @@ class VehicleControl(vehicle: Vehicle)
override def StartJammeredStatus(target: Any, dur: Int): Unit = { override def StartJammeredStatus(target: Any, dur: Int): Unit = {
super.StartJammeredStatus(target, dur) super.StartJammeredStatus(target, dur)
val subsystems = vehicle.Subsystems() val subsystems = vehicle.Subsystems()
if (!subsystems.exists { _.Jammed }) {
subsystems.foreach { _.jam() } subsystems.foreach { _.jam() }
vehicleSubsystemMessages(subsystems.flatMap { _.changedMessages(vehicle) }) vehicleSubsystemMessages(subsystems.flatMap { _.changedMessages(vehicle) })
}
} }
override def CancelJammeredStatus(target: Any): Unit = { override def CancelJammeredStatus(target: Any): Unit = {