TuxCoding/FastLogin
1
0
Fork 1
mirror of https://github.com/TuxCoding/FastLogin.git synced 2025-07-31 19:24:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix breaking ProtocolLib Minecraft version change

Browse Source 
Fixes #1008
This commit is contained in:
games647
2023-03-30 17:25:46 +02:00
parent 23d7594b67
commit 487bc24a8a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java
View File

@@ -179,8 +179,8 @@ public class ProtocolLibListener extends PacketAdapter {
private boolean verifyNonce(Player sender, PacketContainer packet, private boolean verifyNonce(Player sender, PacketContainer packet,
ClientPublicKey clientPublicKey, byte[] expectedToken) { ClientPublicKey clientPublicKey, byte[] expectedToken) {
try { try {
if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0)) if (new MinecraftVersion(1, 19, 0).atOrAbove()
&& !MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) { && !(new MinecraftVersion(1, 19, 3).atOrAbove())) {
Either<byte[], ?> either = packet.getSpecificModifier(Either.class).read(0); Either<byte[], ?> either = packet.getSpecificModifier(Either.class).read(0);
if (clientPublicKey == null) { if (clientPublicKey == null) {
Optional<byte[]> left = either.left(); Optional<byte[]> left = either.left();
@@ -224,7 +224,7 @@ public class ProtocolLibListener extends PacketAdapter {
PacketContainer packet = packetEvent.getPacket(); PacketContainer packet = packetEvent.getPacket();
Optional<ClientPublicKey> clientKey = Optional.empty(); Optional<ClientPublicKey> clientKey = Optional.empty();
if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 3))) { if (new MinecraftVersion(1, 19, 3).atOrAbove()) {
// public key sent separate // public key sent separate
clientKey = Optional.empty(); clientKey = Optional.empty();
} else { } else {

2
bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java
View File

@@ -272,7 +272,7 @@ public class VerifyResponseTask implements Runnable {
//fake a new login packet in order to let the server handle all the other stuff //fake a new login packet in order to let the server handle all the other stuff
private void receiveFakeStartPacket(String username, ClientPublicKey clientKey) { private void receiveFakeStartPacket(String username, ClientPublicKey clientKey) {
PacketContainer startPacket; PacketContainer startPacket;
if (MinecraftVersion.atOrAbove(new MinecraftVersion(1, 19, 0))) { if (new MinecraftVersion(1, 19, 0).atOrAbove()) {
startPacket = new PacketContainer(START); startPacket = new PacketContainer(START);
startPacket.getStrings().write(0, username); startPacket.getStrings().write(0, username);