From 6b58d862486beb4bbf672b7d61d75a016aab00b9 Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Wed, 1 May 2019 11:31:36 -0300 Subject: [PATCH] Make PipelineUtil.containsCause check if the instance is of the class type --- .../java/us/myles/ViaVersion/util/PipelineUtil.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java b/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java index 6be8ac0b8..bf5f63cb2 100644 --- a/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java +++ b/common/src/main/java/us/myles/ViaVersion/util/PipelineUtil.java @@ -6,7 +6,6 @@ import io.netty.channel.ChannelPipeline; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; import io.netty.handler.codec.MessageToMessageDecoder; -import io.netty.handler.codec.MessageToMessageEncoder; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -90,14 +89,15 @@ public class PipelineUtil { * * @param t The throwable * @param c The exception to look for - * @return True if the stack trace contained it as its cause. + * @return True if the stack trace contained it as its cause or if t is an instance of c. */ public static boolean containsCause(Throwable t, Class c) { - while (t != null) { - t = t.getCause(); - if (t != null) + do { + if (t != null) { if (c.isAssignableFrom(t.getClass())) return true; - } + t = t.getCause(); + } + } while (t != null); return false; }