From 219e1d418bfa7a33bc406f0ea488207f6f8a01c3 Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Thu, 23 Feb 2017 18:20:05 -0500 Subject: [PATCH] Add a null check for the throwable message in NetWorkDispatcher#exceptionCaught (#3688) (cherry picked from commit 1be1bb59c5c4c7432c515ef07beb6bf7e1f6ef27) --- .../fml/common/network/handshake/NetworkDispatcher.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java index 2bc977fa8..9faf63a22 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java +++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java @@ -586,7 +586,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler> im if (!(cause instanceof ClosedChannelException)) { // Mute the reset by peer exception - it's disconnection noise - if (cause.getMessage().contains("Connection reset by peer")) + if (cause.getMessage() != null && cause.getMessage().contains("Connection reset by peer")) { FMLLog.log(Level.DEBUG, cause, "Muted NetworkDispatcher exception"); }