From 7e2d7a2089645343982d626cd8f747632a21d572 Mon Sep 17 00:00:00 2001
From: "Jason_DiDonato@yahoo.com" <Jason_DiDonato@yahoo.com>
Date: Sun, 18 Apr 2021 10:17:08 -0400
Subject: [PATCH] even more concise

---
 .../actors/session/AvatarActor.scala          | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/scala/net/psforever/actors/session/AvatarActor.scala b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
index 22c41dfb0..266b91f92 100644
--- a/src/main/scala/net/psforever/actors/session/AvatarActor.scala
+++ b/src/main/scala/net/psforever/actors/session/AvatarActor.scala
@@ -721,13 +721,14 @@ class AvatarActor(
           Behaviors.same
 
         case UpdatePurchaseTime(definition, time) =>
-          if (!Avatar.purchaseCooldowns.contains(definition)) {
-            // TODO only send for items with cooldowns
+          //only send for items with cooldowns
+          Avatar.purchaseCooldowns.get(definition) match {
+            case Some(cooldown) =>
+              // TODO save to db
+              avatar = avatar.copy(purchaseTimes = avatar.purchaseTimes.updated(definition.Name, time))
+              updatePurchaseTimer(definition.Name, cooldown.toSeconds, unk1 = true)
+            case None => ;
             //log.warn(s"UpdatePurchaseTime message for item '${definition.Name}' without cooldown")
-          } else {
-            // TODO save to db
-            avatar = avatar.copy(purchaseTimes = avatar.purchaseTimes.updated(definition.Name, time))
-            refreshPurchaseTimes(Set(definition.Name))
           }
           Behaviors.same
 
@@ -1360,14 +1361,7 @@ class AvatarActor(
                 case _                                =>
                   obj.Name
               }
-              sessionActor ! SessionActor.SendResponse(
-                AvatarVehicleTimerMessage(
-                  session.get.player.GUID,
-                  name,
-                  cooldown.toSeconds - secondsSincePurchase,
-                  unk1 = true //TODO? vehicles = true, everything else = false
-                )
-              )
+              updatePurchaseTimer(name, cooldown.toSeconds - secondsSincePurchase, unk1 = true)
 
             case _ =>
               keysToDrop = keysToDrop :+ key  //key has timed-out
@@ -1379,4 +1373,11 @@ class AvatarActor(
       avatar.copy(purchaseTimes = avatar.purchaseTimes.removedAll(keysToDrop))
     }
   }
+
+  def updatePurchaseTimer(name: String, time: Long, unk1: Boolean): Unit = {
+    //TODO? unk1 is: vehicles = true, everything else = false
+    sessionActor ! SessionActor.SendResponse(
+      AvatarVehicleTimerMessage(session.get.player.GUID, name, time, unk1 = true)
+    )
+  }
 }