From e03d5915e5fe8ac6725eb1de70f816ee8bd44878 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 22 Nov 2016 12:13:07 -0800 Subject: [PATCH] Insert FML packet handler into Vanilla pipelines in case modders send FMLPacket to vanilla. Fixes #3422 --- .../fml/common/network/handshake/NetworkDispatcher.java | 2 ++ 1 file changed, 2 insertions(+) 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 65c5f7adfa..d26fe6bdfb 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 @@ -159,6 +159,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler> im serverInitiateHandshake(); FMLLog.info("Connection received without FML marker, assuming vanilla."); this.completeServerSideConnection(ConnectionType.VANILLA); + insertIntoChannel(); } } @@ -184,6 +185,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler> im { if (this.state != null) { FMLLog.getLogger().log(Level.INFO, "Opening channel which already seems to have a state set. This is a vanilla connection. Handshake handler will stop now"); + this.manager.channel().config().setAutoRead(true); return; } FMLLog.getLogger().log(Level.TRACE, "Handshake channel activating");