Skip to content

Add --lobby-init-mode argument #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gatsik wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add --lobby-init-mode argument #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ice-adapter/src/main/java/com/faforever/iceadapter/IceAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void start() {
PeerIceModule.setForceRelay(iceOptions.isForceRelay());
gpgNetServer = new GPGNetServer();
rpcService = new RPCService();
gpgNetServer.init(iceOptions.getGpgnetPort(), iceOptions.getLobbyPort(), rpcService);
gpgNetServer.init(iceOptions.getGpgnetPort(), iceOptions.getLobbyPort(), rpcService, iceOptions.getLobbyInitMode());
rpcService.init(iceOptions.getRpcPort(), gpgNetServer, this);

PeerIceModule.setForceRelay(iceOptions.isForceRelay());
Expand Down
6 changes: 6 additions & 0 deletions ice-adapter/src/main/java/com/faforever/iceadapter/IceOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,10 @@ public class IceOptions {
defaultValue = "wss://ice-telemetry.faforever.com",
description = "Telemetry server to connect to")
private String telemetryServer;

@Option(
names = "--lobby-init-mode",
defaultValue = "normal",
description = "lobby mode the game will use. Supported values are 'normal' for normal lobby and 'auto' for automatch lobby (aka ladder).")
private String lobbyInitMode;
}
3 changes: 2 additions & 1 deletion ice-adapter/src/main/java/com/faforever/iceadapter/gpgnet/GPGNetServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,10 @@ public static LobbyInitMode getLobbyInitMode() {
return INSTANCE.lobbyInitMode;
}

public void init(int gpgnetPort, int lobbyPort, RPCService rpcService) {
public void init(int gpgnetPort, int lobbyPort, RPCService rpcService, String lobbyInitMode) {
INSTANCE = this;
this.rpcService = rpcService;
this.lobbyInitMode = LobbyInitMode.getByName(lobbyInitMode);

if (gpgnetPort == 0) {
this.gpgnetPort = NetworkToolbox.findFreeTCPPort(20000, 65536);
Expand Down