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

Merge pull request #443 from Fate-JH/turret-kick2

Browse source 
Kick Occupants From Amenities When Facility Is Hacked (properly)
This commit is contained in:
Mazo 2020-05-16 18:56:49 +01:00 committed by GitHub
parent f008b6c79d c439701cca
commit 4fa2be151b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7486,11 +7486,11 @@ class WorldSessionActor extends Actor
}
value = start_num + deciseconds_remaining
sendResponse(PlanetsideAttributeMessage(target_guid, 20, value))
continent.GUID(player.VehicleSeated) match {
case Some(mountable : Amenity with Mountable) =>
if(mountable.Owner.GUID == capture_terminal.Owner.GUID) {
continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.KickPassenger(player.GUID, mountable.Seats.head._1, true, mountable.GUID))
}
GetMountableAndSeat(None, player) match {
case (Some(mountable : Amenity), Some(seat)) if mountable.Owner.GUID == capture_terminal.Owner.GUID =>
mountable.Seats(seat).Occupant = None
player.VehicleSeated = None
continent.VehicleEvents ! VehicleServiceMessage(continent.Id, VehicleAction.KickPassenger(player.GUID, seat, true, mountable.GUID))
case _ => ;
}
case _ => log.warn("HackCaptureTerminal: hack state monitor not defined")