External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-29 06:52:02 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix casting of Disturb cards with Auras on the back (#8600)

Browse source
This commit is contained in:
Alex W. Jackson 2022-07-08 23:37:52 -04:00 • committed by GitHub
parent b473300680
commit a94c837ad0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/main/java/mage/abilities/keyword/DisturbAbility.java
View file

@ -30,14 +30,10 @@ public class DisturbAbility extends SpellAbility {
private SpellAbility spellAbilityToResolve;
public DisturbAbility(Card card, String manaCost) {
super(card.getSpellAbility());
super(card.getSecondFaceSpellAbility());
this.newId();
// verify check
if (card.getSecondCardFace() == null || card.getSecondCardFace().getClass().equals(card.getClass())) {
throw new IllegalArgumentException("Wrong code usage. Disturb ability can be added to double faces card only (main side).");
}
// getSecondFaceSpellAbility() already verified that second face exists
this.setCardName(card.getSecondCardFace().getName() + " with Disturb");
this.zone = Zone.GRAVEYARD;
this.spellAbilityType = SpellAbilityType.BASE_ALTERNATE;

2
Mage/src/main/java/mage/cards/Card.java
View file

@ -72,6 +72,8 @@ public interface Card extends MageObject {
Card getSecondCardFace();
SpellAbility getSecondFaceSpellAbility();
boolean isNightCard();
void assignNewId();

9
Mage/src/main/java/mage/cards/CardImpl.java
View file

@ -636,6 +636,15 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
return secondSideCard;
}
@Override
public SpellAbility getSecondFaceSpellAbility() {
Card secondFace = getSecondCardFace();
if (secondFace == null || secondFace.getClass().equals(getClass())) {
throw new IllegalArgumentException("Wrong code usage. getSecondFaceSpellAbility can only be used for double faced card (main side).");
}
return secondFace.getSpellAbility();
}
@Override
public boolean isNightCard() {
return this.nightCard;

5
Mage/src/main/java/mage/game/stack/Spell.java
View file

@ -768,6 +768,11 @@ public class Spell extends StackObjectImpl implements Card {
return null;
}
@Override
public SpellAbility getSecondFaceSpellAbility() {
return null;
}
@Override
public boolean isNightCard() {
return false;