|
@@ -48,18 +48,15 @@ public class LobbyTimer extends Timer implements Runnable {
|
|
if (mwPlayer.getPlayer() == null) continue;
|
|
if (mwPlayer.getPlayer() == null) continue;
|
|
mwPlayer.getPlayer().setLevel(seconds);
|
|
mwPlayer.getPlayer().setLevel(seconds);
|
|
}
|
|
}
|
|
-
|
|
|
|
- int size1 = getGame().getTeam1().getMembers().size();
|
|
|
|
- int size2 = getGame().getTeam2().getMembers().size();
|
|
|
|
-
|
|
|
|
- if (size1 == 0 || size2 == 0) {
|
|
|
|
|
|
+
|
|
|
|
+ if (hasEmptyPlayerTeam()) {
|
|
seconds = startTime;
|
|
seconds = startTime;
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
--remaining;
|
|
--remaining;
|
|
if (remaining == 0) {
|
|
if (remaining == 0) {
|
|
- if (size1 + size2 < getGame().getLobby().getMinSize()) {
|
|
|
|
|
|
+ if (getGame().areToFewPlayers()) {
|
|
seconds = startTime;
|
|
seconds = startTime;
|
|
remaining = 90;
|
|
remaining = 90;
|
|
broadcast(Messages.getMessage(true, Messages.MessageEnum.LOBBY_NOT_ENOUGH_PLAYERS));
|
|
broadcast(Messages.getMessage(true, Messages.MessageEnum.LOBBY_NOT_ENOUGH_PLAYERS));
|
|
@@ -86,8 +83,7 @@ public class LobbyTimer extends Timer implements Runnable {
|
|
playPling();
|
|
playPling();
|
|
break;
|
|
break;
|
|
case 0:
|
|
case 0:
|
|
- int diff = size1 - size2;
|
|
|
|
- if (diff >= 2 || diff <= -2) {
|
|
|
|
|
|
+ if (hasEmptyPlayerTeam()) {
|
|
broadcast(Messages.getMessage(true, Messages.MessageEnum.LOBBY_TEAMS_UNEQUAL));
|
|
broadcast(Messages.getMessage(true, Messages.MessageEnum.LOBBY_TEAMS_UNEQUAL));
|
|
seconds = startTime;
|
|
seconds = startTime;
|
|
return;
|
|
return;
|
|
@@ -116,5 +112,11 @@ public class LobbyTimer extends Timer implements Runnable {
|
|
playPling();
|
|
playPling();
|
|
getGame().startGame();
|
|
getGame().startGame();
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+
|
|
|
|
+ private boolean hasEmptyPlayerTeam() {
|
|
|
|
+ int size1 = getGame().getTeam1().getMembers().size();
|
|
|
|
+ int size2 = getGame().getTeam2().getMembers().size();
|
|
|
|
+
|
|
|
|
+ return ((size1 == 0) || (size2 == 0));
|
|
|
|
+ }
|
|
}
|
|
}
|