Merge branch 'pr/687' into tfm44

This commit is contained in:
Jerom van der Sar 2015-06-07 17:36:25 +02:00
commit b5c5e60c12

View File

@ -112,7 +112,7 @@ public class TFM_ServerInterface
// Check force-IP match // Check force-IP match
if (TFM_ConfigEntry.FORCE_IP_ENABLED.getBoolean()) if (TFM_ConfigEntry.FORCE_IP_ENABLED.getBoolean())
{ {
final String hostname = event.getHostname().replace("FML", ""); // Forge fix - https://github.com/TotalFreedom/TotalFreedomMod/issues/493 final String hostname = event.getHostname().replace("\u0000FML\u0000", ""); // Forge fix - https://github.com/TotalFreedom/TotalFreedomMod/issues/493
final String connectAddress = TFM_ConfigEntry.SERVER_ADDRESS.getString(); final String connectAddress = TFM_ConfigEntry.SERVER_ADDRESS.getString();
final int connectPort = TotalFreedomMod.server.getPort(); final int connectPort = TotalFreedomMod.server.getPort();