diff --git a/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java index ce850cf..1d81f31 100644 --- a/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java +++ b/1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java @@ -25,25 +25,47 @@ public static void startup() { for (final Player player : Bukkit.getOnlinePlayers()) { final ChannelPipeline pipeline = new CompatiblePlayer().getChannel(player).pipeline(); - pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + if (pipeline.get("packet_handler") == null) { + pipeline.addFirst("no_encryption_interceptor", new ChannelDuplexHandler() { - @Override - public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { - Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); - super.channelRead(channelHandlerContext, newPacket); + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); - } + } - @Override - public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { - Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); - super.write(channelHandlerContext, newPacket, promise); + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); - } + } - }); + }); + } else { + pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); + + } + + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); + + } + + }); + } } diff --git a/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java index ce850cf..43b8a2a 100644 --- a/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java +++ b/1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java @@ -59,25 +59,47 @@ public void onPlayerJoin (PlayerJoinEvent e) { if (e.getPlayer().isOnline()) { final Player player = e.getPlayer(); final ChannelPipeline pipeline = new CompatiblePlayer().getChannel(player).pipeline(); - pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + if (pipeline.get("packet_handler") == null) { + pipeline.addFirst("no_encryption_interceptor", new ChannelDuplexHandler() { - @Override - public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { - Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); - super.channelRead(channelHandlerContext, newPacket); + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); - } + } - @Override - public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { - Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); - super.write(channelHandlerContext, newPacket, promise); + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); - } + } - }); + }); + } else { + pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); + + } + + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); + + } + + }); + } } } else { diff --git a/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java b/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java index ce850cf..1d81f31 100644 --- a/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java +++ b/1.19/src/main/java/me/doclic/noencryption/PlayerListener.java @@ -25,25 +25,47 @@ public static void startup() { for (final Player player : Bukkit.getOnlinePlayers()) { final ChannelPipeline pipeline = new CompatiblePlayer().getChannel(player).pipeline(); - pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + if (pipeline.get("packet_handler") == null) { + pipeline.addFirst("no_encryption_interceptor", new ChannelDuplexHandler() { - @Override - public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { - Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); - super.channelRead(channelHandlerContext, newPacket); + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); - } + } - @Override - public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { - Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); - super.write(channelHandlerContext, newPacket, promise); + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); - } + } - }); + }); + } else { + pipeline.addBefore("packet_handler", "no_encryption_interceptor", new ChannelDuplexHandler() { + + @Override + public void channelRead(ChannelHandlerContext channelHandlerContext, Object packet) throws Exception { + + Object newPacket = new CompatiblePacketListener().readPacket(channelHandlerContext, packet); + super.channelRead(channelHandlerContext, newPacket); + + } + + @Override + public void write(ChannelHandlerContext channelHandlerContext, Object packet, ChannelPromise promise) throws Exception { + + Object newPacket = new CompatiblePacketListener().writePacket(channelHandlerContext, packet, promise); + super.write(channelHandlerContext, newPacket, promise); + + } + + }); + } }