Merge branch 'master' into 'master'

Minor tweak to FlipOntoBattlefieldEffect.

See merge request core-developers/forge!5673
This commit is contained in:
Michael Kamensky
2021-10-29 10:41:32 +00:00

View File

@@ -115,7 +115,7 @@ public class FlipOntoBattlefieldEffect extends SpellAbilityEffect {
return card.isPlaneswalker() || card.isArtifact() || (c.isEnchantment() && !c.isAura());
} else if (c.isLand()) {
return card.isLand();
} else if (c.isAttachedToEntity() && card.getController() == controller) {
} else if (c.isAttachedToEntity()) {
return card.isAttachedToEntity(c.getEntityAttachedTo()) || c.equals(card.getAttachedTo());
}
return card.sharesCardTypeWith(c);