From 589465bb81ca1c2636144630819dd88d4087079c Mon Sep 17 00:00:00 2001 From: James Date: Tue, 18 Aug 2015 11:01:30 -0700 Subject: [PATCH] Fix faulty Channel name --- .../minecraftforge/fml/common/network/NetworkRegistry.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java b/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java index 66ed284b2..3251d9d3d 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/network/NetworkRegistry.java @@ -141,7 +141,7 @@ public enum NetworkRegistry */ public EnumMap newChannel(String name, ChannelHandler... handlers) { - if (channels.containsKey(name) || name.startsWith("MC|") || name.startsWith("\u0001") || name.startsWith("FML")) + if (channels.get(Side.CLIENT).containsKey(name) || channels.get(Side.SERVER).containsKey(name) || name.startsWith("MC|") || name.startsWith("\u0001") || name.startsWith("FML")) { throw new RuntimeException("That channel is already registered"); } @@ -187,7 +187,7 @@ public enum NetworkRegistry */ public EnumMap newChannel(ModContainer container, String name, ChannelHandler... handlers) { - if (channels.containsKey(name) || name.startsWith("MC|") || name.startsWith("\u0001") || (name.startsWith("FML") && !("FML".equals(container.getModId())))) + if (channels.get(Side.CLIENT).containsKey(name) || channels.get(Side.SERVER).containsKey(name) || name.startsWith("MC|") || name.startsWith("\u0001") || (name.startsWith("FML") && !("FML".equals(container.getModId())))) { throw new RuntimeException("That channel is already registered"); }