PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't charge cargo

Browse source
This commit is contained in:
ScrawnyRonnie 2023-11-14 11:05:58 -05:00
parent 9e76fcc42a
commit 962904b3d9
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/scala/net/psforever/actors/session/support/SessionData.scala
View file

@ -963,13 +963,26 @@ class SessionData(
log.debug(s"$pkt")
}
// This is for excluding cargo vehicles from attempting to charge their shield while mounted in a carrier vehicle.
// As per issue 1126, this would cause the client of the cargo vehicle occupant(s) to disconnect
def handleGetCargoVehicles(vehicle: Vehicle): List[Vehicle] = {
val mountedVehicle = vehicle.MountedIn.flatMap { mountedGUID =>
continent.GUID(mountedGUID.guid).collect { case mountedVehicle: Vehicle => mountedVehicle }
}.toList
mountedVehicle
}
def handleIsCargoVehicle(vehicle: Vehicle): Boolean = {
handleGetCargoVehicles(vehicle).nonEmpty
}
def handleFacilityBenefitShieldChargeRequest(pkt: FacilityBenefitShieldChargeRequestMessage): Unit = {
val FacilityBenefitShieldChargeRequestMessage(_) = pkt
val vehicleGuid = player.VehicleSeated
continent
.GUID(vehicleGuid)
.foreach {
case obj: Vehicle if !obj.Destroyed => //vehicle will try to charge even if destroyed
case obj: Vehicle if !obj.Destroyed && !handleIsCargoVehicle(obj) => // vehicle will try to charge even if destroyed
obj.Actor ! CommonMessages.ChargeShields(
15,
Some(continent.blockMap.sector(obj).buildingList.maxBy(_.Definition.SOIRadius))