Skip to content

GitLab

Commit 3612c6af authored by Magix's avatar Magix Committed by GitHub
Browse files

Merge pull request #826 from lilmayofuksu/patch-sslfix 

Fix InRouting on dispatch server
parents e3fd2eaa 3c0d8562
Hide whitespace changes
Inline Side-by-side
src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java
View file @ 3612c6af
...@@ -117,7 +117,7 @@ public final class DispatchServer { ...@@ -117,7 +117,7 @@ public final class DispatchServer {
.setTitle(DISPATCH_INFO.defaultName) .setTitle(DISPATCH_INFO.defaultName)
.setType("DEV_PUBLIC") .setType("DEV_PUBLIC")
.setDispatchUrl( .setDispatchUrl(
"http" + (DISPATCH_ENCRYPTION.useEncryption ? "s" : "") + "://" "http" + (DISPATCH_ENCRYPTION.useInRouting ? "s" : "") + "://"
+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":" + lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort) + lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
+ "/query_cur_region/" + defaultServerName) + "/query_cur_region/" + defaultServerName)
...@@ -150,7 +150,7 @@ public final class DispatchServer { ...@@ -150,7 +150,7 @@ public final class DispatchServer {
.setTitle(regionInfo.Title) .setTitle(regionInfo.Title)
.setType("DEV_PUBLIC") .setType("DEV_PUBLIC")
.setDispatchUrl( .setDispatchUrl(
"http" + (DISPATCH_ENCRYPTION.useEncryption ? "s" : "") + "://" "http" + (DISPATCH_ENCRYPTION.useInRouting ? "s" : "") + "://"
+ lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":" + lr(DISPATCH_INFO.accessAddress, DISPATCH_INFO.bindAddress) + ":"
+ lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort) + lr(DISPATCH_INFO.accessPort, DISPATCH_INFO.bindPort)
+ "/query_cur_region/" + regionInfo.Name) + "/query_cur_region/" + regionInfo.Name)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment