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

moving management of ServerVehicleOverride state to WSA from Vehicle

Browse source
This commit is contained in:
FateJH 2018-05-05 21:36:45 -04:00
parent f4343bbf0d
commit deb0e670ba
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/src/main/scala/net/psforever/objects/Vehicle.scala
View file

@ -47,7 +47,6 @@ class Vehicle(private val vehicleDef : VehicleDefinition) extends PlanetSideServ
private var trunkAccess : Option[PlanetSideGUID] = None private var trunkAccess : Option[PlanetSideGUID] = None
private var jammered : Boolean = false private var jammered : Boolean = false
private var cloaked : Boolean = false private var cloaked : Boolean = false
private var controlled : Option[Int] = None
/** /**
* Permissions control who gets to access different parts of the vehicle; * Permissions control who gets to access different parts of the vehicle;
@ -444,15 +443,6 @@ class Vehicle(private val vehicleDef : VehicleDefinition) extends PlanetSideServ
*/ */
def TrunkLockState : VehicleLockState.Value = groupPermissions(3) def TrunkLockState : VehicleLockState.Value = groupPermissions(3)
def Controlled : Option[Int] = controlled
def Controlled_=(speed : Int) : Option[Int] = Controlled_=(Some(speed))
def Controlled_=(speed : Option[Int]) : Option[Int] = {
controlled = speed
Controlled
}
/** /**
* This is the definition entry that is used to store and unload pertinent information about the `Vehicle`. * This is the definition entry that is used to store and unload pertinent information about the `Vehicle`.
* @return the vehicle's definition entry * @return the vehicle's definition entry

15
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -69,6 +69,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
var usingMedicalTerminal : Option[PlanetSideGUID] = None var usingMedicalTerminal : Option[PlanetSideGUID] = None
var usingProximityTerminal : Set[PlanetSideGUID] = Set.empty var usingProximityTerminal : Set[PlanetSideGUID] = Set.empty
var delayedProximityTerminalResets : Map[PlanetSideGUID, Cancellable] = Map.empty var delayedProximityTerminalResets : Map[PlanetSideGUID, Cancellable] = Map.empty
var controlled : Option[Int] = None //keep track of avatar's ServerVehicleOverride state
var clientKeepAlive : Cancellable = DefaultCancellable.obj var clientKeepAlive : Cancellable = DefaultCancellable.obj
var progressBarUpdate : Cancellable = DefaultCancellable.obj var progressBarUpdate : Cancellable = DefaultCancellable.obj
@ -1059,7 +1060,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
ServerVehicleOverride(vehicle, speed) ServerVehicleOverride(vehicle, speed)
case AutoDriveControls.State.Climb => case AutoDriveControls.State.Climb =>
ServerVehicleOverride(vehicle, vehicle.Controlled.getOrElse(0), GlobalDefinitions.isFlightVehicle(vehicle.Definition):Int) ServerVehicleOverride(vehicle, controlled.getOrElse(0), GlobalDefinitions.isFlightVehicle(vehicle.Definition):Int)
case AutoDriveControls.State.Turn => case AutoDriveControls.State.Turn =>
//TODO how to turn hovering/flying vehicle? //TODO how to turn hovering/flying vehicle?
@ -3901,7 +3902,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
* @param vehicle the vehicle being controlled * @param vehicle the vehicle being controlled
*/ */
def ServerVehicleLock(vehicle : Vehicle) : Unit = { def ServerVehicleLock(vehicle : Vehicle) : Unit = {
vehicle.Controlled = Some(0) controlled = Some(0)
sendResponse(ServerVehicleOverrideMsg(true, true, false, false, 0, 1, 0, Some(0))) sendResponse(ServerVehicleOverrideMsg(true, true, false, false, 0, 1, 0, Some(0)))
} }
@ -3912,7 +3913,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
* @param flight whether the vehicle is ascending or not, if the vehicle is an applicable type * @param flight whether the vehicle is ascending or not, if the vehicle is an applicable type
*/ */
def ServerVehicleOverride(vehicle : Vehicle, speed : Int = 0, flight : Int = 0) : Unit = { def ServerVehicleOverride(vehicle : Vehicle, speed : Int = 0, flight : Int = 0) : Unit = {
vehicle.Controlled = Some(speed) controlled = Some(speed)
sendResponse(ServerVehicleOverrideMsg(true, true, false, false, flight, 0, speed, Some(0))) sendResponse(ServerVehicleOverrideMsg(true, true, false, false, flight, 0, speed, Some(0)))
} }
@ -3924,8 +3925,8 @@ class WorldSessionActor extends Actor with MDCContextAware {
* @param flight whether the vehicle is ascending or not, if the vehicle is an applicable type * @param flight whether the vehicle is ascending or not, if the vehicle is an applicable type
*/ */
def DriverVehicleControl(vehicle : Vehicle, speed : Int = 0, flight : Int = 0) : Unit = { def DriverVehicleControl(vehicle : Vehicle, speed : Int = 0, flight : Int = 0) : Unit = {
if(vehicle.Controlled.nonEmpty) { if(controlled.nonEmpty) {
vehicle.Controlled = None controlled = None
sendResponse(ServerVehicleOverrideMsg(false, false, false, true, flight, 0, speed, None)) sendResponse(ServerVehicleOverrideMsg(false, false, false, true, flight, 0, speed, None))
} }
} }
@ -3937,8 +3938,8 @@ class WorldSessionActor extends Actor with MDCContextAware {
* @param vehicle the vehicle * @param vehicle the vehicle
*/ */
def TotalDriverVehicleControl(vehicle : Vehicle) : Unit = { def TotalDriverVehicleControl(vehicle : Vehicle) : Unit = {
if(vehicle.Controlled.nonEmpty) { if(controlled.nonEmpty) {
vehicle.Controlled = None controlled = None
sendResponse(ServerVehicleOverrideMsg(false, false, false, false, 0, 0, 0, None)) sendResponse(ServerVehicleOverrideMsg(false, false, false, false, 0, 0, 0, None))
} }
} }