diff --git a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java index 8c4cf65543..3c2ee8474b 100644 --- a/src/main/java/cpw/mods/fml/client/FMLClientHandler.java +++ b/src/main/java/cpw/mods/fml/client/FMLClientHandler.java @@ -89,6 +89,7 @@ import cpw.mods.fml.common.StartupQuery; import cpw.mods.fml.common.WrongMinecraftVersionException; import cpw.mods.fml.common.eventhandler.EventBus; import cpw.mods.fml.common.network.FMLNetworkEvent; +import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.toposort.ModSortingException; @@ -700,7 +701,8 @@ public class FMLClientHandler implements IFMLSidedHandler modListBldr.put(modObj.get("modid").getAsString(), modObj.get("version").getAsString()); } - serverDataTag.put(data, new ExtendedServerListData(type, true, modListBldr.build(), !moddedClientAllowed)); + Map modListMap = modListBldr.build(); + serverDataTag.put(data, new ExtendedServerListData(type, FMLNetworkHandler.checkModList(modListMap, Side.CLIENT) == null, modListMap, !moddedClientAllowed)); } else { diff --git a/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java b/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java index d51c3ecf86..b318b415ac 100644 --- a/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java +++ b/src/main/java/cpw/mods/fml/common/network/internal/FMLNetworkHandler.java @@ -126,10 +126,14 @@ public class FMLNetworkHandler public static String checkModList(FMLHandshakeMessage.ModList modListPacket, Side side) { Map modList = modListPacket.modList(); + return checkModList(modList, side); + } + public static String checkModList(Map listData, Side side) + { List rejects = Lists.newArrayList(); for (Entry networkMod : NetworkRegistry.INSTANCE.registry().entrySet()) { - boolean result = networkMod.getValue().check(modList, side); + boolean result = networkMod.getValue().check(listData, side); if (!result) { rejects.add(networkMod.getKey());