PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-07-16 08:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

isolated behavior

Browse source
This commit is contained in:
Fate-JH 2025-08-12 14:04:40 -04:00
parent c9e79def8f
commit 49bd367e92
1 changed files with 17 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/scala/net/psforever/actors/net/LoginActor.scala
View file

@ -153,13 +153,7 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
failWithError(s"Invalid packet class received: $default") failWithError(s"Invalid packet class received: $default")
} }
private def displayingServerListBehavior: Receive = persistentSetupMixinBehavior.orElse { private def nextPortTransferBehavior: Receive = {
case packet: PlanetSideGamePacket =>
handleGamePktDuringWorldSelect(packet)
case LoginActor.UpdateServerList =>
updateServerList()
case SocketPane.NextPort(_, _, portNum) => case SocketPane.NextPort(_, _, portNum) =>
val address = gameTestServerAddress.getAddress.getHostAddress val address = gameTestServerAddress.getAddress.getHostAddress
log.info(s"Connecting to ${address.toLowerCase}: $portNum ...") log.info(s"Connecting to ${address.toLowerCase}: $portNum ...")
@ -167,21 +161,25 @@ class LoginActor(middlewareActor: typed.ActorRef[MiddlewareActor.Command], conne
context.become(idlingIgnoreBehavior) context.become(idlingIgnoreBehavior)
middlewareActor ! MiddlewareActor.Send(response) middlewareActor ! MiddlewareActor.Send(response)
middlewareActor ! MiddlewareActor.Close() middlewareActor ! MiddlewareActor.Close()
case default =>
failWithError(s"Invalid packet class received: $default")
} }
private def waitingForServerTransferBehavior: Receive = persistentSetupMixinBehavior.orElse { private def displayingServerListBehavior: Receive = persistentSetupMixinBehavior
case SocketPane.NextPort(_, _, portNum) => .orElse(nextPortTransferBehavior)
val address = gameTestServerAddress.getAddress.getHostAddress .orElse {
log.info(s"Connecting to ${address.toLowerCase}: $portNum ...") case packet: PlanetSideGamePacket =>
val response = ConnectToWorldMessage(serverName, address, portNum) handleGamePktDuringWorldSelect(packet)
context.become(idlingIgnoreBehavior)
middlewareActor ! MiddlewareActor.Send(response)
middlewareActor ! MiddlewareActor.Close()
case _ => () case LoginActor.UpdateServerList =>
updateServerList()
case default =>
failWithError(s"Invalid packet class received: $default")
}
private def waitingForServerTransferBehavior: Receive = persistentSetupMixinBehavior
.orElse(nextPortTransferBehavior)
.orElse {
case _ => ()
} }
private def handleGamePktDuringLogin(pkt: PlanetSideGamePacket): Unit = { private def handleGamePktDuringLogin(pkt: PlanetSideGamePacket): Unit = {