From 0455226c578d13da81edfd7bbaf54b40d0bd6e82 Mon Sep 17 00:00:00 2001 From: Fate-JH Date: Tue, 2 Jul 2024 12:42:20 -0400 Subject: [PATCH] by default, the server only expect udp on 51000 and 51001; let's keep to that by default --- src/main/resources/application.conf | 2 +- .../scala/net/psforever/actors/net/LoginActor.scala | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf index dc15c07e2..9c603e2a0 100644 --- a/src/main/resources/application.conf +++ b/src/main/resources/application.conf @@ -20,7 +20,7 @@ login { world { # UDP listening port port = 51001 - ports = [51003, 51004, 51005, 51006, 51007, 51008, 51009, 51010] + ports = [] # The name of the server as displayed in the server browser. server-name = PSForever diff --git a/src/main/scala/net/psforever/actors/net/LoginActor.scala b/src/main/scala/net/psforever/actors/net/LoginActor.scala index 31a37a357..4b9a87418 100644 --- a/src/main/scala/net/psforever/actors/net/LoginActor.scala +++ b/src/main/scala/net/psforever/actors/net/LoginActor.scala @@ -27,11 +27,11 @@ import scala.concurrent.duration._ import scala.util.matching.Regex import scala.util.{Failure, Success} - - object LoginActor { sealed trait Command + private case object UpdateServerList extends Command + final case class ReceptionistListing(listing: Receptionist.Listing) extends Command } @@ -41,8 +41,6 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne import scala.concurrent.ExecutionContext.Implicits.global - private case class UpdateServerList() - val usernameRegex: Regex = """[A-Za-z0-9]{3,}""".r var leftRef: ActorRef = Default.Actor @@ -83,7 +81,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne canonicalHostName = address.CanonicalHostName port = address.Port - case UpdateServerList() => + case LoginActor.UpdateServerList => updateServerList() case packet: PlanetSideGamePacket => @@ -213,7 +211,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne } loginSuccessfulResponse(username, newToken) updateServerListTask = - context.system.scheduler.scheduleWithFixedDelay(0 seconds, 5 seconds, self, UpdateServerList()) + context.system.scheduler.scheduleWithFixedDelay(0 seconds, 5 seconds, self, LoginActor.UpdateServerList) future case (_, false) => @@ -271,7 +269,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne ) loginSuccessfulResponseToken(account.username, token, newToken) updateServerListTask = - context.system.scheduler.scheduleWithFixedDelay(0 seconds, 5 seconds, self, UpdateServerList()) + context.system.scheduler.scheduleWithFixedDelay(0 seconds, 5 seconds, self, LoginActor.UpdateServerList) future case (_, false) =>