From 8d7c7743b85a5655493d111178c8e4e2ae9580bd Mon Sep 17 00:00:00 2001 From: KennyTV Date: Sun, 14 Jun 2020 18:15:09 +0200 Subject: [PATCH] Only print codec netty exceptions --- .../ViaVersion/bukkit/handlers/BukkitDecodeHandler.java | 5 +++-- .../ViaVersion/bukkit/handlers/BukkitEncodeHandler.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitDecodeHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitDecodeHandler.java index 87adc5c22..3fd82bb7f 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitDecodeHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitDecodeHandler.java @@ -3,10 +3,11 @@ package us.myles.ViaVersion.bukkit.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; +import io.netty.handler.codec.CodecException; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.bukkit.util.NMSUtil; -import us.myles.ViaVersion.exception.CancelDecoderException; import us.myles.ViaVersion.exception.CancelCodecException; +import us.myles.ViaVersion.exception.CancelDecoderException; import us.myles.ViaVersion.util.PipelineUtil; import java.lang.reflect.InvocationTargetException; @@ -56,7 +57,7 @@ public class BukkitDecodeHandler extends ByteToMessageDecoder { if (PipelineUtil.containsCause(cause, CancelCodecException.class)) return; // ProtocolLib compat super.exceptionCaught(ctx, cause); - if (!NMSUtil.isDebugPropertySet()) { + if (!NMSUtil.isDebugPropertySet() && PipelineUtil.containsCause(cause, CodecException.class)) { cause.printStackTrace(); // Print if CB doesn't already do it } } diff --git a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java index 05b4e6fb8..9be48c3e6 100644 --- a/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java +++ b/bukkit/src/main/java/us/myles/ViaVersion/bukkit/handlers/BukkitEncodeHandler.java @@ -2,11 +2,12 @@ package us.myles.ViaVersion.bukkit.handlers; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; +import io.netty.handler.codec.CodecException; import io.netty.handler.codec.MessageToByteEncoder; import us.myles.ViaVersion.api.data.UserConnection; import us.myles.ViaVersion.bukkit.util.NMSUtil; -import us.myles.ViaVersion.exception.CancelEncoderException; import us.myles.ViaVersion.exception.CancelCodecException; +import us.myles.ViaVersion.exception.CancelEncoderException; import us.myles.ViaVersion.handlers.ChannelHandlerContextWrapper; import us.myles.ViaVersion.handlers.ViaHandler; import us.myles.ViaVersion.util.PipelineUtil; @@ -68,7 +69,7 @@ public class BukkitEncodeHandler extends MessageToByteEncoder implements ViaHand if (PipelineUtil.containsCause(cause, CancelCodecException.class)) return; // ProtocolLib compat super.exceptionCaught(ctx, cause); - if (!NMSUtil.isDebugPropertySet()) { + if (!NMSUtil.isDebugPropertySet() && PipelineUtil.containsCause(cause, CodecException.class)) { cause.printStackTrace(); // Print if CB doesn't already do it } }