loop to streams

This commit is contained in:
igoudt 2017-07-08 10:57:36 +02:00
parent 6eba170e3c
commit a167122459
10 changed files with 38 additions and 81 deletions

View file

@ -28,20 +28,16 @@
package mage.game.draft;
import java.util.*;
import mage.cards.Card;
import mage.cards.ExpansionSet;
import mage.game.draft.DraftOptions.TimingOption;
import mage.game.events.Listener;
import mage.game.events.PlayerQueryEvent;
import mage.game.events.PlayerQueryEventSource;
import mage.game.events.TableEvent;
import mage.game.events.*;
import mage.game.events.TableEvent.EventType;
import mage.game.events.TableEventSource;
import mage.players.Player;
import mage.players.PlayerList;
import java.util.*;
/**
*
* @author BetaSteward_at_googlemail.com
@ -262,22 +258,16 @@ public abstract class DraftImpl implements Draft {
if(isAbort()) {
return true;
}
for (DraftPlayer player: players.values()) {
if (player.isPicking()) {
return false;
}
}
return true;
return players.values()
.stream()
.noneMatch(DraftPlayer::isPicking);
}
@Override
public boolean allJoined() {
for (DraftPlayer player: this.players.values()) {
if (!player.isJoined()) {
return false;
}
}
return true;
return players.values().stream()
.allMatch(DraftPlayer::isJoined);
}
@Override