pick based on player count

Banana4Life · Oct 6, 2024 · 23a0897 · 23a0897
1 parent 7a3ba37
commit 23a0897
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/controllers/Ld56C2Controller.scala b/app/controllers/Ld56C2Controller.scala
@@ -158,7 +158,9 @@ class JoinHandler(out: ActorRef,
             }
           }
           if (viableHosts.nonEmpty) {
-            hosters.get(pickBestHost(viableHosts.toIndexedSeq).id) ! Json.toJson(JoiningMessage(myId)).toString
+            for { host <- pickBestHost(viableHosts.toIndexedSeq) } {
+              hosters.get(host.id) ! Json.toJson(JoiningMessage(myId)).toString
+            }
           }
         case OfferMessage(dest, offer) =>
           hosters.get(dest) ! Json.toJson(OfferingMessage(myId, offer)).toString
@@ -169,7 +171,9 @@ class JoinHandler(out: ActorRef,
         logger.error("Kaputt", e)
   }
 
-  private def pickBestHost(hosts: IndexedSeq[GameHost]): GameHost = {
-    hosts.maxBy(_.lastUpdated)
+  private def pickBestHost(hosts: IndexedSeq[GameHost]): Option[GameHost] = {
+    val actuallyViable = hosts.filter(_.playerCount < 30)
+    implicit val ordering: Ordering[GameHost] = Ordering.by(_.playerCount)
+    actuallyViable.sorted(ordering).headOption
   }
 }