eaglercraft/ayungee-1.5
1
0
Fork 0
mirror of https://github.com/ayunami2000/ayungee.git synced 2024-09-19 08:56:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

quick fix & server timeout after 10sec

Browse Source
This commit is contained in:
ayunami2000 2022-07-08 10:34:00 -04:00
parent 6336ee7fa8
commit 5e5e54dde1
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/me/ayunami2000/ayungee/ChatHandler.java
View File

@ -24,9 +24,6 @@ public class ChatHandler {
try {
int destServer = Integer.parseInt(args);
client.server = Math.max(0, Math.min(Main.servers.size() - 1, destServer));
try {
client.socket.close();
} catch (IOException ignored) {}
} catch (NumberFormatException e) {
//not a number
client.conn.send(new byte[] { 3, 0, 29, 0, (byte) 167, 0, 57, 0, 84, 0, 104, 0, 97, 0, 116, 0, 32, 0, 105, 0, 115, 0, 32, 0, 110, 0, 111, 0, 116, 0, 32, 0, 97, 0, 32, 0, 118, 0, 97, 0, 108, 0, 105, 0, 100, 0, 32, 0, 110, 0, 117, 0, 109, 0, 98, 0, 101, 0, 114, 0, 33 });

1
src/main/java/me/ayunami2000/ayungee/Main.java
View File

@ -282,7 +282,6 @@ public class Main {
try {
int destServer = Integer.parseInt(pieces[2]);
targetUser.server = Math.max(0, Math.min(servers.size() - 1, destServer));
targetUser.socket.close();
printMsg("Successfully send user " + targetUser + " to server " + destServer + "!");
} catch (NumberFormatException e) {
printMsg("That is not a valid number!");

10
src/main/java/me/ayunami2000/ayungee/WebSocketProxy.java
View File

@ -7,6 +7,7 @@ import org.java_websocket.server.WebSocketServer;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer;
import java.time.Instant;
import java.util.*;
@ -125,7 +126,14 @@ public class WebSocketProxy extends WebSocketServer {
selfClient.hasLoginHappened = false;
if (!selfClient.firstTime) Main.printMsg("Player " + selfClient + " joined server " + selfClient.server + "!");
ServerItem chosenServer = Main.servers.get(currServer);
Socket selfSocket = new Socket(chosenServer.host, chosenServer.port);
Socket selfSocket = new Socket();
try {
// todo: pregenerate InetSocketAddresses
selfSocket.connect(new InetSocketAddress(chosenServer.host, chosenServer.port), 10000);
} catch (SocketTimeoutException e) {
conn.close();
return;
}
selfClient.setSocket(selfSocket);
if (!selfClient.firstTime) sendToServer(selfClient.handshake, selfClient);
if (selfClient.firstTime) {

BIN
target/ayungee-1.0-SNAPSHOT-jar-with-dependencies.jar
View File

Binary file not shown.