Bugfix -> Fixed error when no packet-decoder found

NeoProtect · Sep 20, 2023 · 6fb94e8 · 6fb94e8
1 parent d235b03
commit 6fb94e8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/main/java/de/cubeattack/neoprotect/bungee/proxyprotocol/ProxyProtocol.java b/src/main/java/de/cubeattack/neoprotect/bungee/proxyprotocol/ProxyProtocol.java
@@ -132,6 +132,11 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
     }
 
     public void addKeepAlivePacketHandler(Channel channel, AtomicReference<InetSocketAddress> inetAddress, NeoProtectPlugin instance) {
+        if (!channel.pipeline().names().contains(PipelineUtils.PACKET_DECODER)) {
+            instance.getCore().warn("Failed to add KeepAlivePacketHandler (packet-decoder can't be found)");
+            return;
+        }
+
         channel.pipeline().addAfter(PipelineUtils.PACKET_DECODER, "neo-keep-alive-handler", new ChannelInboundHandlerAdapter() {
             @Override
             public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {

diff --git a/src/main/java/de/cubeattack/neoprotect/velocity/proxyprotocol/ProxyProtocol.java b/src/main/java/de/cubeattack/neoprotect/velocity/proxyprotocol/ProxyProtocol.java
@@ -130,6 +130,10 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
     }
 
     public void addKeepAlivePacketHandler(Channel channel, AtomicReference<InetSocketAddress> inetAddress, VelocityServer velocityServer, NeoProtectPlugin instance) {
+        if (!channel.pipeline().names().contains("minecraft-decoder")) {
+            instance.getCore().warn("Failed to add KeepAlivePacketHandler (minecraft-decoder can't be found)");
+            return;
+        }
 
         channel.pipeline().addAfter("minecraft-decoder", "neo-keep-alive-handler", new ChannelInboundHandlerAdapter() {
             @Override