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

Fix AMS, ANT, Router and BFR siphon undeploying when owner leaves zone

Browse source
This commit is contained in:
Resaec 2023-07-07 03:26:05 +02:00
parent 0143e5d343
commit 5d2c321efb
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/scala/net/psforever/actors/session/support/ZoningOperations.scala
View file

@ -1442,8 +1442,22 @@ class ZoningOperations(
if (player.avatar.vehicle.nonEmpty && player.VehicleSeated != player.avatar.vehicle) { if (player.avatar.vehicle.nonEmpty && player.VehicleSeated != player.avatar.vehicle) {
continent.GUID(player.avatar.vehicle) match { continent.GUID(player.avatar.vehicle) match {
case Some(vehicle: Vehicle) if vehicle.Actor != Default.Actor => case Some(vehicle: Vehicle) if vehicle.Actor != Default.Actor =>
sessionData.vehicles.TotalDriverVehicleControl(vehicle)
// 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?
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 _ => sessionData.vehicles.TotalDriverVehicleControl(vehicle)
}
// remove owner
vehicle.Actor ! Vehicle.Ownership(None) vehicle.Actor ! Vehicle.Ownership(None)
case _ => ; case _ => ;
} }
avatarActor ! AvatarActor.SetVehicle(None) avatarActor ! AvatarActor.SetVehicle(None)