From b67b71bd70c6fb3710ae9fdc92c05d49119f2cba Mon Sep 17 00:00:00 2001 From: Resaec Date: Fri, 7 Jul 2023 13:28:25 +0200 Subject: [PATCH] BFR siphon is not a deployment or a continuous action, but a fire action. Removed from check. AMS, ANT and Router will be placed under ConditionalDriverVehicleControl instead. --- .../actors/session/support/ZoningOperations.scala | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala index 949cd80d..702dc6e0 100644 --- a/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala +++ b/src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala @@ -1443,14 +1443,10 @@ class ZoningOperations( continent.GUID(player.avatar.vehicle) match { case Some(vehicle: Vehicle) if vehicle.Actor != Default.Actor => - // allow AMS, router, ANT and BFR siphon to remain deployed when owner leaves the zone - // TODO: do we need to check for left/right siphon? + // allow AMS, ANT and Router to remain deployed when owner leaves the zone vehicle.Definition match { - case GlobalDefinitions.ams | GlobalDefinitions.ant | GlobalDefinitions.router | - GlobalDefinitions.aphelion_ntu_siphon | //GlobalDefinitions.aphelion_ntu_siphon_left | GlobalDefinitions.aphelion_ntu_siphon_right | - GlobalDefinitions.colossus_ntu_siphon | //GlobalDefinitions.colossus_ntu_siphon_left | GlobalDefinitions.colossus_ntu_siphon_right | - GlobalDefinitions.peregrine_ntu_siphon //| GlobalDefinitions.peregrine_ntu_siphon_left | GlobalDefinitions.peregrine_ntu_siphon_right - => // do noting to keep them deployed + case GlobalDefinitions.ams | GlobalDefinitions.ant | GlobalDefinitions.router + => sessionData.vehicles.ConditionalDriverVehicleControl(vehicle) case _ => sessionData.vehicles.TotalDriverVehicleControl(vehicle) }