PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-03-05 13:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

accidentally using the loadout change set armor in exo-suit change set armor; reverted

Browse source
This commit is contained in:
Fate-JH 2024-02-23 00:51:56 -05:00
parent c4d142d586
commit 77c2a4a68b
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/scala/net/psforever/objects/avatar/PlayerControl.scala
View file

@ -630,14 +630,11 @@ class PlayerControl(player: Player, avatarActor: typed.ActorRef[AvatarActor.Comm
val originalArmor = player.Armor
player.ExoSuit = exosuit
val toMaxArmor = player.MaxArmor
val toArmor = {
if (originalArmor > toMaxArmor) {
player.LogActivity(RepairFromExoSuitChange(exosuit, toMaxArmor - player.Armor))
player.Armor = toMaxArmor
} else {
player.Armor = originalArmor
}
val toArmor = toMaxArmor
if (originalSuit != exosuit || originalArmor != toMaxArmor) {
player.LogActivity(RepairFromExoSuitChange(exosuit, toMaxArmor - originalArmor))
}
player.Armor = toMaxArmor
//ensure arm is down, even if it needs to go back up
if (player.DrawnSlot != Player.HandsDownSlot) {
player.DrawnSlot = Player.HandsDownSlot