mirrors
/
PretendYoureXyzzy
mirror of https://github.com/ajanata/PretendYoureXyzzy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #77 from uecasm/skip-kick-fix 

Don't reset game when kicking idle players
This commit is contained in:
Andy Janata 2014-01-25 07:51:13 -08:00
parent 2c6df92d01 cccd08266c
commit 2a46c26c49
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/net/socialgamer/cah/data/Game.java
View File

@ -880,8 +880,9 @@ public class Game {
} }
synchronized (playedCards) { synchronized (playedCards) {
if (state == GameState.PLAYING || playersToRemove.size() == 0) {
// not sure how much of this check is actually required // not sure how much of this check is actually required
if (players.size() < 3 || playedCards.size() < 2 || state != GameState.PLAYING) { if (players.size() < 3 || playedCards.size() < 2) {
logger.info(String.format( logger.info(String.format(
"Resetting game %d due to insufficient players after removing %d idle players.", "Resetting game %d due to insufficient players after removing %d idle players.",
id, playersToRemove.size())); id, playersToRemove.size()));
@ -890,6 +891,7 @@ public class Game {
judgingState(); judgingState();
} }
} }
}
// have to do this after we move to judging state // have to do this after we move to judging state
for (final Player player : playersToUpdateStatus) { for (final Player player : playersToUpdateStatus) {