From 43a403174f58f0a3ebd5fe80e74bb83973a20df2 Mon Sep 17 00:00:00 2001 From: Chord Date: Sat, 14 May 2016 14:31:30 -0400 Subject: [PATCH] Fix bad ServerType encoding and change server type --- .../net/psforever/packet/game/VNLWorldStatusMessage.scala | 3 ++- pslogin/src/main/scala/LoginSessionActor.scala | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala b/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala index 62833859a..4038eb100 100644 --- a/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/VNLWorldStatusMessage.scala @@ -14,7 +14,8 @@ object WorldStatus extends Enumeration { val Up, Down, Locked, Full = Value } -object ServerType extends Enumeration { +// this enumeration starts from one and is subtracted from before processing (0x005FF12A) +object ServerType extends Enumeration(1) { type Type = Value val Development, Beta, Released = Value diff --git a/pslogin/src/main/scala/LoginSessionActor.scala b/pslogin/src/main/scala/LoginSessionActor.scala index 9fa291c66..1550c90e0 100644 --- a/pslogin/src/main/scala/LoginSessionActor.scala +++ b/pslogin/src/main/scala/LoginSessionActor.scala @@ -112,7 +112,7 @@ class LoginSessionActor extends Actor with MDCContextAware { def updateServerList = { val msg = VNLWorldStatusMessage("Welcome to PlanetSide! ", Vector( - WorldInformation(serverName, WorldStatus.Up, ServerType.Development, + WorldInformation(serverName, WorldStatus.Up, ServerType.Released, Vector(WorldConnectionInfo(new InetSocketAddress(InetAddress.getByName("127.0.0.1"), 51000))), EmpireNeed.TR) ))