From 0515ac193df2332c341613dabbca188d1951891c Mon Sep 17 00:00:00 2001 From: games647 Date: Wed, 14 Jul 2021 16:33:18 +0200 Subject: [PATCH] Extract protocollib method detection --- .../bukkit/listener/protocollib/ProtocolLibListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java index 4d76b809..11218623 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/ProtocolLibListener.java @@ -80,7 +80,7 @@ public class ProtocolLibListener extends PacketAdapter { return; } - if (packetEvent.getPacket().getMeta(SOURCE_META_KEY).map(val -> val.equals(plugin.getName())).orElse(false)) { + if (isFastLoginPacket(packetEvent)) { // this is our own packet return; } @@ -99,6 +99,12 @@ public class ProtocolLibListener extends PacketAdapter { } } + private Boolean isFastLoginPacket(PacketEvent packetEvent) { + return packetEvent.getPacket().getMeta(SOURCE_META_KEY) + .map(val -> val.equals(plugin.getName())) + .orElse(false); + } + private void onEncryptionBegin(PacketEvent packetEvent, Player sender) { byte[] sharedSecret = packetEvent.getPacket().getByteArrays().read(0);