diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt index 6e40f6be3..cdc831ac4 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt @@ -68,7 +68,8 @@ object LANServerListener { val thread = Thread({ try { val socket = MulticastSocket(ProtocolDefinition.LAN_SERVER_BROADCAST_PORT) - socket.joinGroup(InetSocketAddress(ProtocolDefinition.LAN_SERVER_BROADCAST_INET_ADDRESS, ProtocolDefinition.LAN_SERVER_BROADCAST_PORT), NetworkInterface.getByInetAddress(ProtocolDefinition.LAN_SERVER_BROADCAST_INET_ADDRESS)) + val inetAddress = InetAddress.getByName(ProtocolDefinition.LAN_SERVER_BROADCAST_ADDRESS) + socket.joinGroup(InetSocketAddress(inetAddress, ProtocolDefinition.LAN_SERVER_BROADCAST_PORT), NetworkInterface.getByInetAddress(inetAddress)) val buffer = ByteArray(256) // this should be enough, if the packet is longer, it is probably invalid Log.log(LogMessageType.NETWORK_STATUS, LogLevels.VERBOSE) { "Listening for LAN servers..." } latch?.dec() diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java index 79a46ddbe..ae22f456f 100644 --- a/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java +++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/ProtocolDefinition.java @@ -17,7 +17,6 @@ import de.bixilon.kotlinglm.vec3.Vec3i; import de.bixilon.minosoft.data.text.formatting.color.ChatColors; import de.bixilon.minosoft.data.text.formatting.color.RGBColor; -import java.net.InetAddress; import java.util.regex.Pattern; public final class ProtocolDefinition { @@ -37,7 +36,6 @@ public final class ProtocolDefinition { public static final int LAN_SERVER_BROADCAST_PORT = 4445; public static final String LAN_SERVER_BROADCAST_ADDRESS = "224.0.2.60"; - public static final InetAddress LAN_SERVER_BROADCAST_INET_ADDRESS; public static final int LAN_SERVER_MAXIMUM_SERVERS = 100; // maximum number of lan servers, set because otherwise dos attacks would be easy public static final String DEFAULT_NAMESPACE = "minecraft"; @@ -92,16 +90,6 @@ public final class ProtocolDefinition { public static final byte MAX_LIGHT_LEVEL = LIGHT_LEVELS - 1; public static final int MAX_LIGHT_LEVEL_I = MAX_LIGHT_LEVEL; - static { - InetAddress inetAddress; - try { - inetAddress = InetAddress.getByName(LAN_SERVER_BROADCAST_ADDRESS); - } catch (Exception e) { - e.printStackTrace(); - inetAddress = null; - } - LAN_SERVER_BROADCAST_INET_ADDRESS = inetAddress; - } public static final String VANILLA_BRAND = "vanilla"; public static final String MINOSOFT_BRAND = "minosoft";