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

rewrite some code to streams

Browse source
This commit is contained in:
igoudt 2018-07-15 20:50:26 +02:00
parent cd0c0b3bdd
commit 877a355a7d
12 changed files with 108 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -3,6 +3,8 @@ package mage.game.combat;
import java.io.Serializable;
import java.util.*;
import java.util.stream.Stream;
import mage.abilities.common.ControllerAssignCombatDamageToBlockersAbility;
import mage.abilities.common.ControllerDivideCombatDamageAbility;
import mage.abilities.common.DamageAsThoughNotBlockedAbility;
@ -61,19 +63,11 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
public boolean hasFirstOrDoubleStrike(Game game) {
for (UUID permId : attackers) {
Permanent attacker = game.getPermanent(permId);
if (attacker != null && hasFirstOrDoubleStrike(attacker)) {
return true;
}
}
for (UUID permId : blockers) {
Permanent blocker = game.getPermanent(permId);
if (blocker != null && hasFirstOrDoubleStrike(blocker)) {
return true;
}
}
return false;
return Stream.concat(attackers.stream(), blockers.stream())
.map(id -> game.getPermanent(id))
.filter(Objects::nonNull)
.anyMatch(this::hasFirstOrDoubleStrike);
}
public UUID getDefenderId() {