External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9116 from DeepCrimson/removeUnusedParamFromContainsControlled

Browse source 
Refactor: Remove unused sourceID param from `containsControlled` method
This commit is contained in:
Oleg Agafonov 2022-06-17 08:41:25 +04:00 • committed by GitHub
commit 6bf9f45cd5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 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

@ -93,7 +93,7 @@ public class Battlefield implements Serializable {
}
public boolean containsControlled(FilterPermanent filter, Ability source, Game game, int num) {
return containsControlled(filter, source.getSourceId(), source.getControllerId(), source, game, num);
return containsControlled(filter, source.getControllerId(), source, game, num);
}
/**
@ -102,21 +102,19 @@ public class Battlefield implements Serializable {
* ignores the range of influence.
*
* @param filter
* @param sourceId
* @param controllerId controller and source can be different (from different players)
* @param source
* @param game
* @param num
* @return boolean
*/
public boolean containsControlled(FilterPermanent filter, UUID sourceId, UUID controllerId, Ability source, Game game, int num) {
public boolean containsControlled(FilterPermanent filter, UUID controllerId, Ability source, Game game, int num) {
return field.values()
.stream()
.filter(permanent -> permanent.isControlledBy(controllerId)
&& filter.match(permanent, controllerId, source, game)
&& permanent.isPhasedIn())
.count() >= num;
}
public boolean contains(FilterPermanent filter, Ability source, Game game, int num) {