github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #9117 from DeepCrimson/removeUnusedParamFromContainsMethod

Browse source 
Refactor: Remove unused `sourceID` param from `contains` method
This commit is contained in:
Oleg Agafonov 2022-06-17 08:40:57 +04:00 committed by GitHub
commit 4e20c4c475
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Mage.Sets/src/mage/cards/a/ArcticFoxes.java
View file

@ -68,6 +68,6 @@ enum ArcticFoxesCondition implements Condition {
if (defenderId == null) {
return false;
}
return game.getBattlefield().contains(filter, source.getSourceId(), defenderId, source, game, 1);
return game.getBattlefield().contains(filter, defenderId, source, game, 1);
}
}
}

2
Mage.Sets/src/mage/cards/c/CityInABottle.java
View file

@ -158,7 +158,7 @@ class CityInABottleStateTriggeredAbility extends StateTriggeredAbility {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
return game.getBattlefield().contains(filter, this.getSourceId(), this.getControllerId(), this, game, 1);
return game.getBattlefield().contains(filter, this.getControllerId(), this, game, 1);
}
@Override

4
Mage.Sets/src/mage/cards/c/CullingScales.java
View file

@ -58,7 +58,7 @@ class HasLowestCMCAmongstNonlandPermanentsPredicate implements ObjectSourcePlaye
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
FilterPermanent filter = new FilterNonlandPermanent();
filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, input.getObject().getManaValue()));
return !game.getBattlefield().contains(filter, input.getSourceId(), input.getPlayerId(), input.getSource(), game, 1);
return !game.getBattlefield().contains(filter, input.getPlayerId(), input.getSource(), game, 1);
}
}
}

2
Mage.Sets/src/mage/cards/h/HeraldOfLeshrac.java
View file

@ -101,7 +101,7 @@ class HeraldOfLeshracCumulativeCost extends CostImpl {
@Override
public boolean canPay(Ability ability, Ability source, UUID controllerId, Game game) {
return game.getBattlefield().contains(filter, source.getSourceId(), controllerId, source, game, 1);
return game.getBattlefield().contains(filter, controllerId, source, game, 1);
}
@Override

2
Mage.Sets/src/mage/cards/s/Seasinger.java
View file

@ -81,6 +81,6 @@ enum SeasingerPredicate implements ObjectSourcePlayerPredicate<Permanent> {
@Override
public boolean apply(ObjectSourcePlayer<Permanent> input, Game game) {
return game.getBattlefield().contains(filter, input.getSourceId(), input.getObject().getControllerId(), input.getSource(), game, 1);
return game.getBattlefield().contains(filter, input.getObject().getControllerId(), input.getSource(), game, 1);
}
}

2
Mage.Sets/src/mage/cards/w/WeddingRing.java
View file

@ -124,7 +124,7 @@ class WeddingRingTriggeredAbility extends TriggeredAbilityImpl {
public boolean checkTrigger(GameEvent event, Game game) {
if (!game.isActivePlayer(event.getPlayerId())
|| !game.getOpponents(getControllerId()).contains(event.getPlayerId())
|| !game.getBattlefield().contains(filter, getSourceId(), event.getPlayerId(), this, game, 1)) {
|| !game.getBattlefield().contains(filter, event.getPlayerId(), this, game, 1)) {
return false;
}
this.getEffects().clear();

2
Mage/src/main/java/mage/abilities/keyword/LandwalkAbility.java
View file

@ -64,7 +64,7 @@ class LandwalkEffect extends RestrictionEffect {
@Override
public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game, boolean canUseChooseDialogs) {
if (game.getBattlefield().contains(filter, source.getSourceId(), blocker.getControllerId(), source, game, 1)
if (game.getBattlefield().contains(filter, blocker.getControllerId(), source, game, 1)
&& null == game.getContinuousEffects().asThough(blocker.getId(), AsThoughEffectType.BLOCK_LANDWALK, null, blocker.getControllerId(), game)) {
switch (filter.getMessage()) {
case "plains":

2
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -2555,7 +2555,7 @@ public abstract class GameImpl implements Game {
filterLegendName.add(SuperType.LEGENDARY.getPredicate());
filterLegendName.add(new NamePredicate(legend.getName()));
filterLegendName.add(new ControllerIdPredicate(legend.getControllerId()));
if (getBattlefield().contains(filterLegendName, null, legend.getControllerId(), null, this, 2)) {
if (getBattlefield().contains(filterLegendName, legend.getControllerId(), null, this, 2)) {
if (!replaceEvent(GameEvent.getEvent(GameEvent.EventType.DESTROY_PERMANENT_BY_LEGENDARY_RULE, legend.getId(), legend.getControllerId()))) {
Player controller = this.getPlayer(legend.getControllerId());
if (controller != null) {

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

@ -120,7 +120,7 @@ public class Battlefield implements Serializable {
}
public boolean contains(FilterPermanent filter, Ability source, Game game, int num) {
return contains(filter, source.getSourceId(), source.getControllerId(), source, game, num);
return contains(filter, source.getControllerId(), source, game, num);
}
/**
@ -129,14 +129,13 @@ public class Battlefield implements Serializable {
* matches the supplied filter.
*
* @param filter
* @param sourceId can be null for default SBA checks like legendary rule
* @param sourcePlayerId
* @param source
* @param game
* @param num
* @return boolean
*/
public boolean contains(FilterPermanent filter, UUID sourceId, UUID sourcePlayerId, Ability source, Game game, int num) {
public boolean contains(FilterPermanent filter, UUID sourcePlayerId, Ability source, Game game, int num) {
if (game.getRangeOfInfluence() == RangeOfInfluence.ALL) {
return field.values().stream()
.filter(permanent -> filter.match(permanent, sourcePlayerId, source, game)