Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-25 20:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix connection bugs without removing binding address (#993)

Browse Source 
* Fix connection bugs according to #921

Fix this for connect to game by local device or remote devices according to #921

* Fix connection bugs according to #921

same

* Update GameServer.java

* fix build

* Update GameServer.java
This commit is contained in:
zhaodice 2022-05-19 23:35:14 +08:00 committed by GitHub
parent cf7c4832fe
commit 2a467a48dc
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/emu/grasscutter/server/game/GameServer.java
View File

@ -58,13 +58,21 @@ public final class GameServer extends KcpServer {
private final CombineManger combineManger; private final CombineManger combineManger;
private final TowerScheduleManager towerScheduleManager; private final TowerScheduleManager towerScheduleManager;
public GameServer() { private static InetSocketAddress getAdapterInetSocketAddress(){
this(new InetSocketAddress( InetSocketAddress inetSocketAddress = null;
GAME_INFO.bindAddress, if(GAME_INFO.bindAddress.equals("")){
GAME_INFO.bindPort inetSocketAddress=new InetSocketAddress(GAME_INFO.bindPort);
)); }else{
inetSocketAddress=new InetSocketAddress(
GAME_INFO.bindAddress,
GAME_INFO.bindPort
);
}
return inetSocketAddress;
}
public GameServer() {
this(getAdapterInetSocketAddress());
} }
public GameServer(InetSocketAddress address) { public GameServer(InetSocketAddress address) {
super(address); super(address);

6
src/main/java/emu/grasscutter/server/http/HttpServer.java
View File

@ -129,7 +129,11 @@ public final class HttpServer {
*/ */
public void start() { public void start() {
// Attempt to start the HTTP server. // Attempt to start the HTTP server.
this.express.listen(HTTP_INFO.bindAddress, HTTP_INFO.bindPort); if(HTTP_INFO.bindAddress.equals("")){
this.express.listen(HTTP_INFO.bindPort);
}else{
this.express.listen(HTTP_INFO.bindAddress, HTTP_INFO.bindPort);
}
// Log bind information. // Log bind information.
Grasscutter.getLogger().info(translate("messages.dispatch.port_bind", Integer.toString(this.express.raw().port()))); Grasscutter.getLogger().info(translate("messages.dispatch.port_bind", Integer.toString(this.express.raw().port())));