PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

Fix telling newer 1.7 Forge clients that they are outdated. Fixes #1476

Browse Source 
* Only check the version of FML if we are running Minecraft 1.7.10 - 1.8 clients are always valid.
* If the version of FML that is reported is 7.10.99.99 - report the Forge version instead.
This commit is contained in:
Daniel Naylor 2015-05-23 11:38:13 +01:00 committed by md_5
parent a3a31fd2dd
commit f3c14cf064
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
proxy/src/main/java/net/md_5/bungee/forge/ForgeClientHandshakeState.java
View File

@ -4,6 +4,7 @@ import java.util.Map;
import net.md_5.bungee.ServerConnector; import net.md_5.bungee.ServerConnector;
import net.md_5.bungee.UserConnection; import net.md_5.bungee.UserConnection;
import net.md_5.bungee.forge.ForgeLogger.LogDirection; import net.md_5.bungee.forge.ForgeLogger.LogDirection;
import net.md_5.bungee.protocol.ProtocolConstants;
import net.md_5.bungee.protocol.packet.PluginMessage; import net.md_5.bungee.protocol.packet.PluginMessage;
/** /**
@ -86,16 +87,19 @@ enum ForgeClientHandshakeState implements IForgeClientPacketHandler<ForgeClientH
Map<String, String> clientModList = ForgeUtils.readModList( message ); Map<String, String> clientModList = ForgeUtils.readModList( message );
con.getForgeClientHandler().setClientModList( clientModList ); con.getForgeClientHandler().setClientModList( clientModList );
// Get the version from the mod list. // If the user is running 1.8 or above, we don't need to check the version of FML - it's always an OK version.
// TODO: Remove this once Bungee becomes 1.8 only. if ( con.getPendingConnection().getVersion() < ProtocolConstants.MINECRAFT_1_8 )
int buildNumber = ForgeUtils.getFmlBuildNumber( clientModList );
// If we get 0, we're probably using a testing build, so let it though. Otherwise, check the build number.
if ( buildNumber < ForgeConstants.FML_MIN_BUILD_VERSION && buildNumber != 0 )
{ {
// Mark the user as an old Forge user. This will then cause any Forge ServerConnectors to cancel any // Get the version from the mod list.
// connections to it. int buildNumber = ForgeUtils.getFmlBuildNumber( clientModList );
con.getForgeClientHandler().setForgeOutdated( true );
// If we get 0, we're probably using a testing build, so let it though. Otherwise, check the build number.
if ( buildNumber < ForgeConstants.FML_MIN_BUILD_VERSION && buildNumber != 0 )
{
// Mark the user as an old Forge user. This will then cause any Forge ServerConnectors to cancel any
// connections to it.
con.getForgeClientHandler().setForgeOutdated( true );
}
} }
} }

23
proxy/src/main/java/net/md_5/bungee/forge/ForgeUtils.java
View File

@ -61,11 +61,26 @@ public class ForgeUtils
{ {
if ( modList.containsKey( "FML" ) ) if ( modList.containsKey( "FML" ) )
{ {
Matcher matcher = ForgeConstants.FML_HANDSHAKE_VERSION_REGEX.matcher( modList.get( "FML" ) ); String fmlVersion = modList.get( "FML" );
if ( matcher.find() )
// FML's version is hardcoded to this for builds beyond 1405 for 1.7.10 - if we see this, return Forge's build number.
if ( fmlVersion.equals( "7.10.99.99" ) )
{ {
// We know from the regex that we have an int. Matcher matcher = ForgeConstants.FML_HANDSHAKE_VERSION_REGEX.matcher( modList.get( "Forge" ) );
return Integer.parseInt( matcher.group( 4 ) ); if ( matcher.find() )
{
// We know from the regex that we have an int.
return Integer.parseInt( matcher.group( 4 ) );
}
}
else
{
Matcher matcher = ForgeConstants.FML_HANDSHAKE_VERSION_REGEX.matcher( fmlVersion );
if ( matcher.find() )
{
// We know from the regex that we have an int.
return Integer.parseInt( matcher.group( 4 ) );
}
} }
} }