Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Refactor PutCards to address issue #9643 (#9644)

Browse source
This commit is contained in:
Alex W. Jackson 2022-10-14 01:07:14 -04:00 • committed by GitHub
parent 332db3aecb
commit 5e891f50c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 69 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -417,7 +417,7 @@ public class Spell extends StackObjectImpl implements Card {
}
@Override
public void counter(Ability source, Game game, PutCards zone) {
public void counter(Ability source, Game game, PutCards putCard) {
// source can be null for fizzled spells, don't use that code in your ZONE_CHANGE watchers/triggers:
// event.getSourceId().equals
// TODO: fizzled spells are no longer considered "countered" as of current rules; may need refactor
@ -429,30 +429,7 @@ public class Spell extends StackObjectImpl implements Card {
}
Player player = game.getPlayer(source == null ? getControllerId() : source.getControllerId());
if (player != null) {
switch (zone) {
case TOP_OR_BOTTOM:
if (player.chooseUse(Outcome.Detriment,
"Put the countered spell on the top or bottom of its owner's library?",
null, "Top", "Bottom", source, game
)) {
player.putCardsOnTopOfLibrary(new CardsImpl(card), game, source, false);
} else {
player.putCardsOnBottomOfLibrary(new CardsImpl(card), game, source, false);
}
break;
case TOP_ANY:
player.putCardsOnTopOfLibrary(new CardsImpl(card), game, source, false);
break;
case BOTTOM_ANY:
case BOTTOM_RANDOM:
player.putCardsOnBottomOfLibrary(new CardsImpl(card), game, source, false);
break;
case BATTLEFIELD_TAPPED:
player.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null);
break;
default:
player.moveCards(card, zone.getZone(), source, game);
}
putCard.moveCard(player, card, source, game, "countered spell");
}
}

4
Mage/src/main/java/mage/game/stack/SpellStack.java
View file

@ -62,7 +62,7 @@ public class SpellStack extends ArrayDeque<StackObject> {
return counter(objectId, source, game, PutCards.GRAVEYARD);
}
public boolean counter(UUID objectId, Ability source, Game game, PutCards zone) {
public boolean counter(UUID objectId, Ability source, Game game, PutCards putCard) {
StackObject stackObject = getStackObject(objectId);
MageObject sourceObject = game.getObject(source);
if (stackObject != null && sourceObject != null) {
@ -82,7 +82,7 @@ public class SpellStack extends ArrayDeque<StackObject> {
if (!(stackObject instanceof Spell)) { // spells are removed from stack by the card movement
this.remove(stackObject, game);
}
stackObject.counter(source, game, zone);
stackObject.counter(source, game, putCard);
if (!game.isSimulation()) {
game.informPlayers(counteredObjectName + " is countered by " + sourceObject.getLogName());
}

2
Mage/src/main/java/mage/game/stack/StackAbility.java
View file

@ -109,7 +109,7 @@ public class StackAbility extends StackObjectImpl implements Ability {
}
@Override
public void counter(Ability source, Game game, PutCards zone) {
public void counter(Ability source, Game game, PutCards putCard) {
//20100716 - 603.8
if (ability instanceof StateTriggeredAbility) {
((StateTriggeredAbility) ability).counter(game);

2
Mage/src/main/java/mage/game/stack/StackObject.java
View file

@ -24,7 +24,7 @@ public interface StackObject extends MageObject, Controllable {
*/
void counter(Ability source, Game game);
void counter(Ability source, Game game, PutCards zone);
void counter(Ability source, Game game, PutCards putCard);
Ability getStackAbility();