Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

add method Game.isActivePlayer(UUID playerId)

Browse source
This commit is contained in:
igoudt 2018-06-29 14:59:11 +02:00
parent 2b78716a1b
commit ca1ebeb55e
16 changed files with 33 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/game/Game.java
View file

@ -3,6 +3,8 @@ package mage.game;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Collectors;
import mage.MageItem;
import mage.MageObject;
import mage.abilities.Ability;
@ -119,15 +121,17 @@ public interface Game extends MageItem, Serializable {
* @param playerId
* @return
*/
default public Set<UUID> getOpponents(UUID playerId) {
Set<UUID> opponents = new HashSet<>();
default Set<UUID> getOpponents(UUID playerId) {
Player player = getPlayer(playerId);
for (UUID opponentId : player.getInRange()) {
if (!opponentId.equals(playerId)) {
opponents.add(opponentId);
}
}
return opponents;
return player.getInRange().stream()
.filter(opponentId -> !opponentId.equals(playerId))
.collect(Collectors.toSet());
}
default boolean isActivePlayer(UUID playerId){
return getActivePlayerId().equals(playerId);
}
/**
@ -141,7 +145,7 @@ public interface Game extends MageItem, Serializable {
* @param playerToCheckId
* @return
*/
default public boolean isOpponent(Player player, UUID playerToCheckId) {
default boolean isOpponent(Player player, UUID playerToCheckId) {
return !player.getId().equals(playerToCheckId);
}