diff --git a/Mage/src/mage/filter/FilterAbility.java b/Mage/src/mage/filter/FilterAbility.java index e6086dcc21..58f400a0bb 100644 --- a/Mage/src/mage/filter/FilterAbility.java +++ b/Mage/src/mage/filter/FilterAbility.java @@ -41,7 +41,7 @@ import java.util.List; * * @author BetaSteward_at_googlemail.com */ -public class FilterAbility extends FilterImpl> implements Filter { +public class FilterAbility extends FilterImpl> { protected static ListComparer compOutcome = new ListComparer(); diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java index 01eb2e04d2..49b7c07b5c 100644 --- a/Mage/src/mage/filter/FilterObject.java +++ b/Mage/src/mage/filter/FilterObject.java @@ -32,16 +32,10 @@ import mage.MageObject; /** * - * @author BetaSteward_at_googlemail.com * @author North */ public class FilterObject> extends FilterImpl { - /** - * Indicates that filter shouldn't match the source. - */ - protected boolean another; - @Override public FilterObject copy() { return new FilterObject(this); @@ -53,14 +47,5 @@ public class FilterObject> ex public FilterObject(FilterObject filter) { super(filter); - this.another = filter.another; - } - - public boolean isAnother() { - return another; - } - - public void setAnother(boolean another) { - this.another = another; } } diff --git a/Mage/src/mage/filter/FilterPermanent.java b/Mage/src/mage/filter/FilterPermanent.java index f41cad2b77..4f223e3891 100644 --- a/Mage/src/mage/filter/FilterPermanent.java +++ b/Mage/src/mage/filter/FilterPermanent.java @@ -55,6 +55,7 @@ public class FilterPermanent> extends FilterObject< protected boolean phasedIn; protected TargetController controller = TargetController.ANY; protected TargetController owner = TargetController.ANY; + protected boolean another; public FilterPermanent() { super("permanent"); @@ -76,6 +77,7 @@ public class FilterPermanent> extends FilterObject< this.phasedIn = filter.phasedIn; this.controller = filter.controller; this.owner = filter.owner; + this.another = filter.another; } public FilterPermanent(String name) { @@ -204,6 +206,14 @@ public class FilterPermanent> extends FilterObject< this.owner = owner; } + public boolean isAnother() { + return another; + } + + public void setAnother(boolean another) { + this.another = another; + } + public boolean matchOwner(UUID testOwnerId) { if (ownerId.size() > 0 && ownerId.contains(testOwnerId) == notOwner) return false;