From 77c2a4a68b962496c6028fac791bc7870bc418a5 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Fri, 23 Feb 2024 00:51:56 -0500 Subject: [PATCH] accidentally using the loadout change set armor in exo-suit change set armor; reverted --- .../net/psforever/objects/avatar/PlayerControl.scala | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala index 5153457dd..002475f49 100644 --- a/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala +++ b/src/main/scala/net/psforever/objects/avatar/PlayerControl.scala @@ -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