mirror of
https://github.com/PaperMC/Waterfall.git
synced 2024-09-27 22:17:57 +02:00
a9cb069f22
it has been a long time and we still have no idea why this exists bar silencing some warning on certain backend versions. Closes #465 Fixes #413
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From f97fb438b8ac483a526e36da5af9728bbb306b20 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sun, 8 May 2022 12:04:30 +0100
|
|
Subject: [PATCH] Improve login state transition
|
|
|
|
|
|
diff --git a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
index bb9063f6..f5959b66 100644
|
|
--- a/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
+++ b/proxy/src/main/java/net/md_5/bungee/connection/InitialHandler.java
|
|
@@ -504,6 +504,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
{
|
|
Preconditions.checkState( thisState == State.ENCRYPT, "Not expecting ENCRYPT" );
|
|
Preconditions.checkState( EncryptionUtil.check( loginRequest.getPublicKey(), encryptResponse, request ), "Invalid verification" );
|
|
+ thisState = State.FINISHING; // Waterfall - move earlier - There is no verification of this later (and this is not API)
|
|
|
|
SecretKey sharedKey = EncryptionUtil.getSecret( encryptResponse, request );
|
|
// Waterfall start
|
|
@@ -558,7 +559,7 @@ public class InitialHandler extends PacketHandler implements PendingConnection
|
|
}
|
|
}
|
|
};
|
|
- thisState = State.FINISHING;
|
|
+ //thisState = State.FINISHING; // Waterfall - move earlier
|
|
HttpClient.get( authURL, ch.getHandle().eventLoop(), handler );
|
|
}
|
|
|
|
--
|
|
2.44.0
|
|
|