From 3612ad0c25d103ba9bc81b32e8ecfef2dfc1cadc Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Wed, 7 May 2014 13:31:16 -0700 Subject: [PATCH] Attempt to fix another race condition related to reading NetClientHandler. --- src/main/java/cpw/mods/fml/client/FMLClientHandler.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index 77fa59d6cb..a19119a08f 100644 --- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -834,6 +834,7 @@ public class FMLClientHandler implements IFMLSidedHandler @Override public void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set channelSet, String channel, Side side) { + waitForPlayClient(); if (side == Side.CLIENT) { bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent(manager, channelSet, channel, side, NetHandlerPlayClient.class));