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

clarification that the player has actually sat down

Browse source
This commit is contained in:
FateJH 2020-05-14 12:16:09 -04:00
parent 8f339801cf
commit d3c45a2ae1
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
common/src/main/scala/net/psforever/objects/vehicles/VehicleControl.scala
View file

@ -82,7 +82,9 @@ class VehicleControl(vehicle : Vehicle) extends Actor
case msg @ Mountable.TryMount(player, seat_num) => case msg @ Mountable.TryMount(player, seat_num) =>
tryMountBehavior.apply(msg) tryMountBehavior.apply(msg)
val obj = MountableObject val obj = MountableObject
if(obj.Seats.values.exists(_.isOccupied)) { //check that the player has actually been sat in the expected seat
if(obj.PassengerInSeat(player).contains(seat_num)) {
//if the driver seat, change ownership
if(seat_num == 0 && !obj.OwnerName.contains(player.Name)) { if(seat_num == 0 && !obj.OwnerName.contains(player.Name)) {
//whatever vehicle was previously owned //whatever vehicle was previously owned
vehicle.Zone.GUID(player.VehicleOwned) match { vehicle.Zone.GUID(player.VehicleOwned) match {
@ -108,6 +110,7 @@ class VehicleControl(vehicle : Vehicle) extends Actor
if(!obj.Seats(0).isOccupied) { if(!obj.Seats(0).isOccupied) {
obj.Velocity = Some(Vector3.Zero) obj.Velocity = Some(Vector3.Zero)
} }
//are we already decaying? are we unowned? is no one seated anywhere?
if(!decaying && obj.Owner.isEmpty && obj.Seats.values.forall(!_.isOccupied)) { if(!decaying && obj.Owner.isEmpty && obj.Seats.values.forall(!_.isOccupied)) {
decaying = true decaying = true
decayTimer = context.system.scheduler.scheduleOnce(MountableObject.Definition.DeconstructionTime.getOrElse(5 minutes), self, VehicleControl.PrepareForDeletion()) decayTimer = context.system.scheduler.scheduleOnce(MountableObject.Definition.DeconstructionTime.getOrElse(5 minutes), self, VehicleControl.PrepareForDeletion())