Merge pull request #5222 from JayDi85/production_master

Fixed compilation errors
This commit is contained in:
Oleg Agafonov 2018-08-15 11:58:22 +04:00 committed by GitHub
commit bcb7b7593d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -94,7 +94,6 @@ class SalvageTraderEffect extends ContinuousEffectImpl {
if(you != null && permanent1 != null) {
FilterArtifactCard filterArtifactCard = new FilterArtifactCard();
filterArtifactCard.add(new ControllerPredicate(TargetController.OPPONENT));
filterArtifactCard.add(new SpellZonePredicate(Zone.BATTLEFIELD));
filterArtifactCard.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, permanent1.getConvertedManaCost()));
FilterArtifactPermanent filterArtifactPermanent = new FilterArtifactPermanent();

View file

@ -13,6 +13,7 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Zone;
import mage.filter.common.FilterCreatureOrPlayer;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.target.common.TargetCreatureOrPlayer;
@ -26,7 +27,7 @@ public final class ThermalDetonator extends CardImpl {
private static final FilterCreatureOrPlayer filter = new FilterCreatureOrPlayer("creature without spaceflight or target player");
static {
filter.add(Predicates.not(new AbilityPredicate(SpaceflightAbility.class)));
filter.getCreatureFilter().add(Predicates.not(new AbilityPredicate(SpaceflightAbility.class)));
}
public ThermalDetonator(UUID ownerId, CardSetInfo setInfo) {