Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
ziqian zhang
Grasscutter
Commits
8ad6bda3
Commit
8ad6bda3
authored
May 11, 2022
by
mingjun97
Committed by
Melledy
May 11, 2022
Browse files
Bug fixes.
* Fix default port for the game server * Fix the returning region info
parent
37e1ffed
Changes
2
Show whitespace changes
Inline
Side-by-side
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View file @
8ad6bda3
...
@@ -125,8 +125,8 @@ public final class DispatchServer {
...
@@ -125,8 +125,8 @@ public final class DispatchServer {
servers
.
add
(
server
);
servers
.
add
(
server
);
RegionInfo
serverRegion
=
regionQuery
.
getRegionInfo
().
toBuilder
()
RegionInfo
serverRegion
=
regionQuery
.
getRegionInfo
().
toBuilder
()
.
setGateserverIp
(
lr
(
DISPATCH
_INFO
.
accessAddress
,
DISPATCH
_INFO
.
bindAddress
))
.
setGateserverIp
(
lr
(
GAME
_INFO
.
accessAddress
,
GAME
_INFO
.
bindAddress
))
.
setGateserverPort
(
lr
(
DISPATCH
_INFO
.
accessPort
,
DISPATCH
_INFO
.
bindPort
))
.
setGateserverPort
(
lr
(
GAME
_INFO
.
accessPort
,
GAME
_INFO
.
bindPort
))
.
setSecretKey
(
ByteString
.
copyFrom
(
FileUtils
.
read
(
KEYS_FOLDER
+
"/dispatchSeed.bin"
)))
.
setSecretKey
(
ByteString
.
copyFrom
(
FileUtils
.
read
(
KEYS_FOLDER
+
"/dispatchSeed.bin"
)))
.
build
();
.
build
();
...
...
src/main/java/emu/grasscutter/utils/ConfigContainer.java
View file @
8ad6bda3
...
@@ -126,9 +126,9 @@ public class ConfigContainer {
...
@@ -126,9 +126,9 @@ public class ConfigContainer {
/* This is the address used in the default region. */
/* This is the address used in the default region. */
public
String
accessAddress
=
"127.0.0.1"
;
public
String
accessAddress
=
"127.0.0.1"
;
public
int
bindPort
=
443
;
public
int
bindPort
=
22102
;
/* This is the port used in the default region. */
/* This is the port used in the default region. */
public
int
accessPort
=
443
;
public
int
accessPort
=
22102
;
public
GameOptions
gameOptions
=
new
GameOptions
();
public
GameOptions
gameOptions
=
new
GameOptions
();
public
JoinOptions
joinOptions
=
new
JoinOptions
();
public
JoinOptions
joinOptions
=
new
JoinOptions
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment