External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-23 19:59:54 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Helm of Obedience - Fixed that card movement to graveyard was not handled correct. It was not checked, if card was really moved to graveyard (fixes #1004).

Browse source
This commit is contained in:
LevelX2 2015-06-02 22:50:57 +02:00
parent 78961ad511
commit bb28394f71
4 changed files with 108 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Mage.Sets/src/mage/sets/alliances/HelmOfObedience.java
View file

@ -97,32 +97,32 @@ class HelmOfObedienceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(targetPointer.getFirst(game, source));
if (player != null) {
Player targetOpponent = game.getPlayer(targetPointer.getFirst(game, source));
if (targetOpponent != null) {
int max = amount.calculate(game, source, this);
if(max != 0){
int numberOfCard = 0;
while(player.getLibrary().size() > 0) {
Card card = player.getLibrary().removeFromTop(game);
while(targetOpponent.getLibrary().size() > 0) {
Card card = targetOpponent.getLibrary().removeFromTop(game);
if (card != null){
player.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game);
if(card.getCardType().contains(CardType.CREATURE)){
// If a creature card is put into that graveyard this way, sacrifice Helm of Obedience
// and put that card onto the battlefield under your control.
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent != null) {
sourcePermanent.sacrifice(source.getSourceId(), game);
}
if (game.getState().getZone(card.getId()).equals(Zone.GRAVEYARD)) {
card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId());
}
break;
}
else{
numberOfCard++;
if(numberOfCard >= max){
if (targetOpponent.moveCards(card, Zone.LIBRARY, Zone.GRAVEYARD, source, game)) {
if(card.getCardType().contains(CardType.CREATURE)){
// If a creature card is put into that graveyard this way, sacrifice Helm of Obedience
// and put that card onto the battlefield under your control.
Permanent sourcePermanent = game.getPermanent(source.getSourceId());
if (sourcePermanent != null) {
sourcePermanent.sacrifice(source.getSourceId(), game);
}
if (game.getState().getZone(card.getId()).equals(Zone.GRAVEYARD)) {
card.putOntoBattlefield(game, Zone.GRAVEYARD, source.getSourceId(), source.getControllerId());
}
break;
} else{
numberOfCard++;
if(numberOfCard >= max){
break;
}
}
}
} else{