Defer configuration of channel until it is actually available during

connection. Closes #5626

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-03-25 17:20:44 -04:00
1 parent 36470f69ad
commit d8d30e1f82
3 files changed
+30 -15

No files matched your search

@@ -75,15 +75,14 @@ public class NetworkHooks
FMLHandshakeHandler.registerHandshake(manager, NetworkDirection.LOGIN_TO_CLIENT);
}
public static void registerClientLoginChannel(NetworkManager manager)
public synchronized static void registerClientLoginChannel(NetworkManager manager)
{
if (manager == null || manager.channel() == null) return;
manager.channel().attr(FMLNetworkConstants.FML_NETVERSION).set(FMLNetworkConstants.NOVERSION);
FMLHandshakeHandler.registerHandshake(manager, NetworkDirection.LOGIN_TO_SERVER);
}
public static void handleClientLoginSuccess(NetworkManager manager) {
if (manager == null || manager.channel() == null) return;
if (manager == null || manager.channel() == null) throw new NullPointerException("ARGH! Network Manager is null (" + manager != null ? "CHANNEL" : "MANAGER"+")" );
if (getConnectionType(()->manager) == ConnectionType.VANILLA) {
LOGGER.info("Connected to a vanilla server. Catching up missing behaviour.");
ConfigTracker.INSTANCE.loadDefaultServerConfigs();