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

Ability refactor: source improves, deprecated code removed;

Browse source
This commit is contained in:
Oleg Agafonov 2020-05-28 22:38:31 +04:00
parent 8af43dc13a
commit eea808d2d6
27 changed files with 37 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/game/permanent/Battlefield.java
View file

@ -327,16 +327,16 @@ public class Battlefield implements Serializable {
}
}
public List<Permanent> getPhasedIn(UUID controllerId) {
public List<Permanent> getPhasedIn(Game game, UUID controllerId) {
return field.values()
.stream()
.filter(perm -> perm.getAbilities().containsKey(PhasingAbility.getInstance().getId())
.filter(perm -> perm.hasAbility(PhasingAbility.getInstance(), game)
&& perm.isPhasedIn()
&& perm.isControlledBy(controllerId))
.collect(Collectors.toList());
}
public List<Permanent> getPhasedOut(UUID controllerId) {
public List<Permanent> getPhasedOut(Game game, UUID controllerId) {
return field.values()
.stream()
.filter(perm -> !perm.isPhasedIn() && perm.isControlledBy(controllerId))