R3944Realms/Ambassador
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Caching of handshake data should work

Browse Source
This commit is contained in:
Adrian Bergqvist 2022-06-05 21:34:39 +02:00
parent 4e4cead245
commit c095c04756
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/adde0109/ambassador/ForgeConnectionHandler.java Normal file
View File

@ -0,0 +1,9 @@
package org.adde0109.ambassador;
public class ForgeConnectionHandler {
}

10
src/main/java/org/adde0109/ambassador/ForgeHandshakeDataHandler.java
View File

@ -28,7 +28,7 @@ public class ForgeHandshakeDataHandler {
public byte[] recivedClientACK; public byte[] recivedClientACK;
public byte[] recivedClientModlist; public byte[] recivedClientModlist;
private static final int PACKET_LENGTH_INDEX = 14; private static final int PACKET_LENGTH_INDEX = 14; //length of "fml:handshake"+1
private final Logger logger; private final Logger logger;
private RegisteredServer handshakeServer; private RegisteredServer handshakeServer;
@ -40,14 +40,20 @@ public class ForgeHandshakeDataHandler {
@Subscribe(order = PostOrder.EARLY) @Subscribe(order = PostOrder.EARLY)
public void onPreLogin(PreLoginEvent event, Continuation continuation) { public void onPreLogin(PreLoginEvent event, Continuation continuation) {
if (cachedServerHandshake == null) { if(handshakeServer.getPlayersConnected().isEmpty()) {
handshakeReceiver receiver = new handshakeReceiver(handshakeServer, logger); handshakeReceiver receiver = new handshakeReceiver(handshakeServer, logger);
receiver.downloadHandshake().thenAccept((p) -> { receiver.downloadHandshake().thenAccept((p) -> {
cachedServerHandshake = p;
sendModlist(p.modListPacket,(LoginPhaseConnection) event.getConnection()); sendModlist(p.modListPacket,(LoginPhaseConnection) event.getConnection());
sendOther(p.otherPackets,(LoginPhaseConnection) event.getConnection()); sendOther(p.otherPackets,(LoginPhaseConnection) event.getConnection());
continuation.resume(); continuation.resume();
}); });
} }
else if(cachedServerHandshake != null) {
sendModlist(cachedServerHandshake.modListPacket, (LoginPhaseConnection) event.getConnection());
sendOther(cachedServerHandshake.otherPackets,(LoginPhaseConnection) event.getConnection());
continuation.resume();
}
} }
@Subscribe @Subscribe