From 2cd1d32fbe7728bdbdeb17db1bb2c16688d0e949 Mon Sep 17 00:00:00 2001 From: mingjun97 Date: Wed, 11 May 2022 00:16:09 -0700 Subject: [PATCH] Bug fixes. * Fix default port for the game server * Fix the returning region info --- .../java/emu/grasscutter/server/dispatch/DispatchServer.java | 4 ++-- src/main/java/emu/grasscutter/utils/ConfigContainer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java index 3ae4ea08a..2ff35a3e2 100644 --- a/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java +++ b/src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java @@ -125,8 +125,8 @@ public final class DispatchServer { servers.add(server); RegionInfo serverRegion = regionQuery.getRegionInfo().toBuilder() - .setGateserverIp(lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress)) - .setGateserverPort(lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)) + .setGateserverIp(lr(GAME_INFO.accessAddress, GAME_INFO.bindAddress)) + .setGateserverPort(lr(GAME_INFO.accessPort, GAME_INFO.bindPort)) .setSecretKey(ByteString.copyFrom(FileUtils.read(KEYS_FOLDER + "/dispatchSeed.bin"))) .build(); diff --git a/src/main/java/emu/grasscutter/utils/ConfigContainer.java b/src/main/java/emu/grasscutter/utils/ConfigContainer.java index a848dff39..0a453191c 100644 --- a/src/main/java/emu/grasscutter/utils/ConfigContainer.java +++ b/src/main/java/emu/grasscutter/utils/ConfigContainer.java @@ -126,9 +126,9 @@ public class ConfigContainer { /* This is the address used in the default region. */ public String accessAddress = "127.0.0.1"; - public int bindPort = 443; + public int bindPort = 22102; /* This is the port used in the default region. */ - public int accessPort = 443; + public int accessPort = 22102; public GameOptions gameOptions = new GameOptions(); public JoinOptions joinOptions = new JoinOptions();