eaglercraft/ayungee-1.5
1
0
Fork 0
mirror of https://github.com/ayunami2000/ayungee.git synced 2024-12-21 22:34:12 -08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug with changing servers on newer versions

Browse Source
This commit is contained in:
ayunami2000 2022-07-06 18:05:12 -04:00
parent 9c9d3c28eb
commit 9d45885acb
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/ayunami2000/ayungee/Client.java
View File

@ -20,6 +20,10 @@ public class Client {
public byte[] handshake = null; public byte[] handshake = null;
public boolean firstTime = true;
public boolean hasLoginHappened = false;
public int clientEntityId; public int clientEntityId;
public int serverEntityId; public int serverEntityId;

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

@ -115,14 +115,17 @@ public class WebSocketProxy extends WebSocketServer {
Main.clients.put(conn, selfClient); Main.clients.put(conn, selfClient);
new Thread(() -> { new Thread(() -> {
try { try {
boolean firstTime = true;
while (conn.isOpen()) { while (conn.isOpen()) {
int currServer = selfClient.server; int currServer = selfClient.server;
selfClient.hasLoginHappened = false;
ServerItem chosenServer = Main.servers.get(currServer); ServerItem chosenServer = Main.servers.get(currServer);
Socket selfSocket = new Socket(chosenServer.host, chosenServer.port); Socket selfSocket = new Socket(chosenServer.host, chosenServer.port);
selfClient.setSocket(selfSocket); selfClient.setSocket(selfSocket);
if (!firstTime) sendToServer(selfClient.handshake, selfClient); if (!selfClient.firstTime) sendToServer(selfClient.handshake, selfClient);
while (selfClient.msgCache.size() > 0) sendToServer(selfClient.msgCache.remove(0), selfClient); if (selfClient.firstTime) {
while (selfClient.msgCache.size() > 0)
sendToServer(selfClient.msgCache.remove(0), selfClient);
}
while (conn.isOpen() && !selfSocket.isInputShutdown() && selfClient.server == currServer) { while (conn.isOpen() && !selfSocket.isInputShutdown() && selfClient.server == currServer) {
byte[] dataa = new byte[maxBuffSize]; byte[] dataa = new byte[maxBuffSize];
int read = selfClient.socketIn.read(dataa, 0, maxBuffSize); int read = selfClient.socketIn.read(dataa, 0, maxBuffSize);
@ -135,8 +138,9 @@ public class WebSocketProxy extends WebSocketServer {
} else { } else {
continue; continue;
} }
if (firstTime && data[0] == 1) selfClient.clientEntityId = selfClient.serverEntityId = EntityMap.readInt(data, 1); if (data[0] == 1 && !selfClient.hasLoginHappened) selfClient.hasLoginHappened = true;
if (!firstTime && data[0] == 1) { if (selfClient.firstTime && data[0] == 1) selfClient.clientEntityId = selfClient.serverEntityId = EntityMap.readInt(data, 1);
if (!selfClient.firstTime && data[0] == 1) {
selfClient.serverEntityId = EntityMap.readInt(data, 1); selfClient.serverEntityId = EntityMap.readInt(data, 1);
// assume server is giving valid data; we don't have to validate it because it isn't a potentially malicious client // assume server is giving valid data; we don't have to validate it because it isn't a potentially malicious client
byte[] worldByte = new byte[data[6] * 2 + 2]; byte[] worldByte = new byte[data[6] * 2 + 2];
@ -165,7 +169,7 @@ public class WebSocketProxy extends WebSocketServer {
if (conn.isOpen() && selfClient.server == currServer) conn.close(); if (conn.isOpen() && selfClient.server == currServer) conn.close();
if (!selfSocket.isClosed()) selfSocket.close(); if (!selfSocket.isClosed()) selfSocket.close();
selfClient.socketOut = null; selfClient.socketOut = null;
firstTime = false; selfClient.firstTime = false;
} }
} catch (IOException ex) { } catch (IOException ex) {
conn.close(); conn.close();
@ -209,6 +213,7 @@ public class WebSocketProxy extends WebSocketServer {
if (msg.length > 0 && msg[0] == (byte) 250) { if (msg.length > 0 && msg[0] == (byte) 250) {
if (Skins.setSkin(currClient.username, conn, msg)) return; if (Skins.setSkin(currClient.username, conn, msg)) return;
} }
if (!currClient.firstTime && !currClient.hasLoginHappened && !(msg[0] == 1 || msg[0] == 2)) return;
if (currClient.socketOut == null || currClient.socket.isOutputShutdown()) { if (currClient.socketOut == null || currClient.socket.isOutputShutdown()) {
currClient.msgCache.add(msg); currClient.msgCache.add(msg);
} else { } else {

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

Binary file not shown.