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

don't need vals

Browse source
This commit is contained in:
ScrawnyRonnie 2023-12-10 18:55:18 -05:00
parent 35bfab5768
commit 46b446048d
2 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/scala/net/psforever/objects/serverobject/damage/DamageableMountable.scala
View file

@ -80,10 +80,7 @@ object DamageableMountable {
.flatMap { _.occupant }
.collect { case player if player.isAlive =>
//make llu visible to others in zone if passenger is carrying one
val zone = player.Zone
val events = zone.AvatarEvents
val nameChannel = player.Name
events ! AvatarServiceMessage(nameChannel, AvatarAction.DropSpecialItem())
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Name, AvatarAction.DropSpecialItem())
//player.LogActivity(cause)
player.Actor ! Player.Die(
DamageInteraction(interaction.resolution, SourceEntry(player), interaction.cause, interaction.hitPos)

10
src/main/scala/net/psforever/services/account/AccountPersistenceService.scala
View file

@ -366,10 +366,7 @@ class PersistenceMonitor(
(inZone.Players.find(p => p.name == name), inZone.LivePlayers.find(p => p.Name == name)) match {
case (Some(avatar), Some(player)) if player.VehicleSeated.nonEmpty =>
//in case the player is holding the llu and disconnects
val zone = player.Zone
val events = zone.AvatarEvents
val nameChannel = player.Name
events ! AvatarServiceMessage(nameChannel, AvatarAction.DropSpecialItem())
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Name, AvatarAction.DropSpecialItem())
//alive or dead in a vehicle
//if the avatar is dead while in a vehicle, they haven't released yet
AvatarActor.saveAvatarData(avatar)
@ -387,10 +384,7 @@ class PersistenceMonitor(
case (Some(avatar), Some(player)) =>
//in case the player is holding the llu and disconnects
val zone = player.Zone
val events = zone.AvatarEvents
val nameChannel = player.Name
events ! AvatarServiceMessage(nameChannel, AvatarAction.DropSpecialItem())
player.Zone.AvatarEvents ! AvatarServiceMessage(player.Name, AvatarAction.DropSpecialItem())
//alive or dead, as standard Infantry
AvatarActor.saveAvatarData(avatar)
AvatarActor.finalSavePlayerData(player)