GeyserMC/Geyser
GeyserMC
/
Geyser
mirror of https://github.com/GeyserMC/Geyser.git
4
4
Fork 3
Code Issues 103 Projects Releases Wiki Activity

Fix direct connection and ensure connecting doesn't block

This commit is contained in:
Camotoy 2022-06-05 18:38:29 -04:00
parent bcc68ee4b5
commit 09fb6bf3ba
No known key found for this signature in database
GPG Key ID: 7EEFB66FE798081F
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/geysermc/geyser/network/netty/LocalSession.java
View File

@ -58,7 +58,7 @@ public final class LocalSession extends TcpSession {
}
@Override
public void connect() {
public void connect(boolean wait) {
if (this.disconnected) {
throw new IllegalStateException("Connection has already been disconnected.");
}

4
core/src/main/java/org/geysermc/geyser/session/GeyserSession.java
View File

@ -845,7 +845,7 @@ public class GeyserSession implements GeyserConnection, CommandSender {
// We're going to connect through the JVM and not through TCP
downstream = new LocalSession(this.remoteAddress, this.remotePort,
geyser.getBootstrap().getSocketAddress(), upstream.getAddress().getAddress().getHostAddress(),
this.protocol, this.downstream.getCodecHelper());
this.protocol, this.protocol.createHelper());
} else {
downstream = new TcpClientSession(this.remoteAddress, this.remotePort, this.protocol);
disableSrvResolving();
@ -1017,7 +1017,7 @@ public class GeyserSession implements GeyserConnection, CommandSender {
setDaylightCycle(true);
}
downstream.connect();
downstream.connect(false);
}
public void disconnect(String reason) {