From 18aed8bf1b02193d6fa3140399b94d5705afdb35 Mon Sep 17 00:00:00 2001
From: Lex Manos <LexManos@gmail.com>
Date: Wed, 7 May 2014 13:31:16 -0700
Subject: [PATCH] Attempt to fix another race condition related to reading
 NetClientHandler.

---
 fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
index 77fa59d6c..a19119a08 100644
--- a/fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java
+++ b/fml/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<String> channelSet, String channel, Side side)
     {
+        waitForPlayClient();
         if (side == Side.CLIENT)
         {
             bus.post(new FMLNetworkEvent.CustomPacketRegistrationEvent<NetHandlerPlayClient>(manager, channelSet, channel, side, NetHandlerPlayClient.class));