Skip to content
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

Jump to bottom

Make reconnects possible #113

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Make reconnects possible #113

wants to merge 2 commits into from

Conversation

1-alex98
Copy link
Member

Fixes #112

@1-alex98 1-alex98 requested a review from micheljung January 19, 2019 15:25
@coveralls
Copy link

coveralls commented Jan 19, 2019 •
edited
Loading

Coverage Status

Coverage decreased (-0.01%) to 84.448% when pulling 34f1633 on bugfix/#112-dont-close-peers-on-no-con into e4f2b81 on develop.

Geosearchef
Geosearchef previously approved these changes Jan 19, 2019
View reviewed changes
Copy link
Member

@Geosearchef Geosearchef left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good to me

faf-java-server-app/src/main/java/com/faforever/server/game/GameService.java
@@ -581,8 +581,14 @@ public void onPlayerOfflineEvent(PlayerOfflineEvent event) {
playerGameStateCounters.get(event.getPlayer().getGameState()).decrementAndGet();
}

/**
* Removes player from his current game. It removes player completely by default, if running it does leave the
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removes player from their current game ;)

faf-java-server-app/src/main/java/com/faforever/server/game/GameService.java
@@ -710,7 +716,7 @@ private void addPlayer(Game game, Player player) {
markDirty(game, DEFAULT_MIN_DELAY, DEFAULT_MAX_DELAY);
}

private void removePlayer(Game game, Player player) {
private void removePlayer(Game game, Player player, boolean reconnectPossible) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allowReconnect?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Geosearchef Geosearchef Geosearchef left review comments

@micheljung micheljung Awaiting requested review from micheljung

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@1-alex98 @coveralls @Geosearchef