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

Merge pull request #584 from Fate-JH/trunk-access-fix

Browse source 
Trunk Content Access
This commit is contained in:
Fate-JH 2020-09-21 23:18:39 -04:00 committed by GitHub
parent d70d23deb8 adc95168b0
commit 11289caa64
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/scala/net/psforever/actors/session/SessionActor.scala
View file

@ -6150,9 +6150,6 @@ class SessionActor extends Actor with MDCContextAware {
*/
def AccessVehicleContents(vehicle: Vehicle): Unit = {
accessedContainer = Some(vehicle)
if(vehicle.AccessingTrunk.isEmpty) {
vehicle.AccessingTrunk = Some(player.GUID)
}
AccessVehicleContainerChannel(vehicle)
DisplayContainerContents(vehicle.GUID, vehicle)
}
@ -6879,7 +6876,28 @@ class SessionActor extends Actor with MDCContextAware {
progressBarUpdate.cancel()
progressBarValue = None
lastTerminalOrderFulfillment = true
UnaccessContainer()
accessedContainer match {
case Some(v: Vehicle) =>
val vguid = v.GUID
if(v.AccessingTrunk.contains(player.GUID)) {
if(player.VehicleSeated.contains(vguid)) {
v.AccessingTrunk = None //player is seated; just stop accessing trunk
if(player.isAlive) {
sendResponse(UnuseItemMessage(player.GUID, vguid))
}
} else {
UnaccessContainer(v)
}
}
case Some(o) =>
UnaccessContainer(o)
if(player.isAlive) {
sendResponse(UnuseItemMessage(player.GUID, o.GUID))
}
case None => ;
}
prefire.orElse(shooting) match {
case Some(guid) =>
sendResponse(ChangeFireStateMessage_Stop(guid))