github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 11:08:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issues revealed by EquipAbilityTest

Browse source
This commit is contained in:
North 2012-07-17 20:36:28 +03:00
parent b7f57c8a23
commit 5dbc3a1c07
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/mage/filter/FilterPermanent.java
View file

@ -51,7 +51,7 @@ public class FilterPermanent extends FilterObject<Permanent> {
public FilterPermanent(final FilterPermanent filter) {
super(filter);
this.extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Permanent>>>(extraPredicates);
this.extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Permanent>>>(filter.extraPredicates);
}
public FilterPermanent(String name) {

2
Mage/src/mage/filter/FilterStackObject.java
View file

@ -56,7 +56,7 @@ public class FilterStackObject<T extends StackObject> extends FilterObject<T> {
public FilterStackObject(final FilterStackObject filter) {
super(filter);
this.extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Permanent>>>(extraPredicates);
this.extraPredicates = new ArrayList<ObjectPlayerPredicate<ObjectPlayer<Permanent>>>(filter.extraPredicates);
}
public boolean match(T stackObject, UUID playerId, Game game) {

2
Mage/src/mage/filter/predicate/permanent/ControllerPredicate.java
View file

@ -70,7 +70,7 @@ public class ControllerPredicate implements ObjectPlayerPredicate<ObjectPlayer<P
break;
}
return true;
return false;
}
@Override

2
Mage/src/mage/target/TargetPermanent.java
View file

@ -75,7 +75,7 @@ public class TargetPermanent<T extends TargetPermanent<T>> extends TargetObject<
@Override
public boolean canTarget(UUID id, Ability source, Game game) {
return canTarget(null, id, source, game);
return canTarget(source.getControllerId(), id, source, game);
}
public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) {