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

Merge pull request #1115 from Resaec/fix_ams_ant_router_undeploy_on_owner_zone_change

Browse source 
Fix AMS, ANT, Router and BFR siphon undeploying when owner leaves zone
This commit is contained in:
Fate-JH 2023-07-07 10:02:17 -04:00 • committed by GitHub
commit b0d7ae12d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1442,8 +1442,18 @@ 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, ANT and Router to remain deployed when owner leaves the zone
vehicle.Definition match {
case GlobalDefinitions.ams | GlobalDefinitions.ant | GlobalDefinitions.router
=> sessionData.vehicles.ConditionalDriverVehicleControl(vehicle)
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)