Minor port-related fixes.

Signed-off-by: Jeffrey Han <itdelatrisu@gmail.com>
This commit is contained in:
Jeffrey Han 2015-08-12 22:00:58 -05:00
parent 7dc5f973de
commit 93615736af
2 changed files with 7 additions and 3 deletions

View File

@ -38,7 +38,9 @@ import java.io.FileNotFoundException;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.PrintStream; import java.io.PrintStream;
import java.net.InetAddress;
import java.net.ServerSocket; import java.net.ServerSocket;
import java.net.UnknownHostException;
import org.newdawn.slick.Color; import org.newdawn.slick.Color;
import org.newdawn.slick.GameContainer; import org.newdawn.slick.GameContainer;
@ -116,12 +118,14 @@ public class Opsu extends StateBasedGame {
// only allow a single instance // only allow a single instance
try { try {
SERVER_SOCKET = new ServerSocket(Options.getPort()); SERVER_SOCKET = new ServerSocket(Options.getPort(), 1, InetAddress.getLocalHost());
} catch (UnknownHostException e) {
// shouldn't happen
} catch (IOException e) { } catch (IOException e) {
ErrorHandler.error(String.format( ErrorHandler.error(String.format(
"opsu! could not be launched for one of these reasons:\n" + "opsu! could not be launched for one of these reasons:\n" +
"- An instance of opsu! is already running.\n" + "- An instance of opsu! is already running.\n" +
"- Another program is running on port %d. " + "- Another program is bound to port %d. " +
"You can change the port opsu! uses by editing the \"Port\" field in the configuration file.", "You can change the port opsu! uses by editing the \"Port\" field in the configuration file.",
Options.getPort()), null, false); Options.getPort()), null, false);
System.exit(1); System.exit(1);

View File

@ -212,7 +212,7 @@ public class Options {
@Override @Override
public void read(String s) { public void read(String s) {
int i = Integer.parseInt(s); int i = Integer.parseInt(s);
if (i > 0 && i < 65535) if (i > 0 && i <= 65535)
port = i; port = i;
} }
}, },