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 657b60fa..ef5ec7b8 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 @@ -64,8 +64,6 @@ import static com.comphenix.protocol.PacketType.Login.Client.START; public class ProtocolLibListener extends PacketAdapter { - public static final String SOURCE_META_KEY = "source"; - private final FastLoginBukkit plugin; //just create a new once on plugin enable. This used for verify token generation @@ -104,11 +102,6 @@ public class ProtocolLibListener extends PacketAdapter { return; } - if (isFastLoginPacket(packetEvent)) { - // this is our own packet - return; - } - plugin.getLog().info("New packet {} from {}", packetEvent.getPacketType(), packetEvent.getPlayer()); Player sender = packetEvent.getPlayer(); @@ -139,12 +132,6 @@ 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); diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java index f3e1bc90..ebe2b6f5 100644 --- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java +++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/listener/protocollib/VerifyResponseTask.java @@ -288,7 +288,6 @@ public class VerifyResponseTask implements Runnable { } //we don't want to handle our own packets so ignore filters - startPacket.setMeta(ProtocolLibListener.SOURCE_META_KEY, plugin.getName()); - ProtocolLibrary.getProtocolManager().receiveClientPacket(player, startPacket, true); + ProtocolLibrary.getProtocolManager().receiveClientPacket(player, startPacket, false); } }