AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-09 15:29:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

only start handling and packet thread when connected to server

Browse Source
This commit is contained in:
bixilon 2020-06-03 14:47:07 +02:00
parent 38843dedde
commit dfefd5c50f
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
View File

@ -34,16 +34,6 @@ public class Connection {
network = new Network(this); network = new Network(this);
handlingQueue = new ArrayList<>(); handlingQueue = new ArrayList<>();
handler = new PacketHandler(this); handler = new PacketHandler(this);
Thread handleThread = new Thread(() -> {
while (getConnectionState() != ConnectionState.DISCONNECTING) {
while (handlingQueue.size() > 0) {
handlingQueue.get(0).handle(getHandler());
handlingQueue.remove(0);
}
Util.sleep(1);
}
});
handleThread.start();
} }
/** /**
@ -83,7 +73,9 @@ public class Connection {
this.state = state; this.state = state;
switch (state) { switch (state) {
case HANDSHAKING: case HANDSHAKING:
// connection established, logging in // connection established, starting threads and logging in
network.startPacketThread();
startHandlingThread();
ConnectionState next = (onlyPing ? ConnectionState.STATUS : ConnectionState.LOGIN); ConnectionState next = (onlyPing ? ConnectionState.STATUS : ConnectionState.LOGIN);
network.sendPacket(new PacketHandshake(getHost(), getPort(), next, (onlyPing) ? -1 : getVersion().getVersion())); network.sendPacket(new PacketHandshake(getHost(), getPort(), next, (onlyPing) ? -1 : getVersion().getVersion()));
// after sending it, switch to next state // after sending it, switch to next state
@ -128,4 +120,17 @@ public class Connection {
public void sendPacket(ServerboundPacket p) { public void sendPacket(ServerboundPacket p) {
network.sendPacket(p); network.sendPacket(p);
} }
private void startHandlingThread() {
Thread handleThread = new Thread(() -> {
while (getConnectionState() != ConnectionState.DISCONNECTED) {
while (handlingQueue.size() > 0) {
handlingQueue.get(0).handle(getHandler());
handlingQueue.remove(0);
}
Util.sleep(1);
}
});
handleThread.start();
}
} }

6
src/main/java/de/bixilon/minosoft/protocol/network/Network.java
View File

@ -108,14 +108,16 @@ public class Network {
} }
}); });
socketThread.start(); socketThread.start();
}
public void startPacketThread() {
// compressed data, makes packets to binary data // compressed data, makes packets to binary data
// read data // read data
// safety first, but will not occur // safety first, but will not occur
// sleep 1 ms // sleep 1 ms
Thread packetThread = new Thread(() -> { Thread packetThread = new Thread(() -> {
// compressed data, makes packets to binary data // compressed data, makes packets to binary data
while (connection.getConnectionState() != ConnectionState.DISCONNECTING) { while (connection.getConnectionState() != ConnectionState.DISCONNECTED) {
while (queue.size() > 0) { while (queue.size() > 0) {
ServerboundPacket p = queue.get(0); ServerboundPacket p = queue.get(0);
@ -170,10 +172,8 @@ public class Network {
Util.sleep(1); // sleep 1 ms Util.sleep(1); // sleep 1 ms
} }
connection.setConnectionState(ConnectionState.DISCONNECTED);
}); });
packetThread.start(); packetThread.start();
} }
public void sendPacket(ServerboundPacket p) { public void sendPacket(ServerboundPacket p) {