github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-17 09:16:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Convoke - Fixed a bug that for convoke was wrongly checked that a creature has to be in the graveyard of the controller.

Browse source
This commit is contained in:
LevelX2 2015-03-09 23:50:33 +01:00
parent 9c63b142ed
commit 853df00dcd
1 changed files with 101 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/mage/abilities/keyword/ConvokeAbility.java
View file

@ -25,7 +25,6 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.keyword;
import java.util.ArrayList;
@ -46,6 +45,7 @@ import mage.constants.ManaType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.TappedPredicate;
@ -91,6 +91,12 @@ import mage.target.common.TargetControlledCreaturePermanent;
*/
public class ConvokeAbility extends SimpleStaticAbility implements AlternateManaPaymentAbility {
private static final FilterCreaturePermanent filterUntapped = new FilterCreaturePermanent();
static {
filterUntapped.add(Predicates.not(new TappedPredicate()));
}
public ConvokeAbility() {
super(Zone.STACK, null);
this.setRuleAtTheTop(true);
@ -108,7 +114,7 @@ public class ConvokeAbility extends SimpleStaticAbility implements AlternateMana
@Override
public void addSpecialAction(Ability source, Game game, ManaCost unpaid) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && controller.getGraveyard().size() > 0) {
if (controller != null && game.getBattlefield().contains(filterUntapped, controller.getId(), 1, game)) {
if (unpaid.getMana().getColorless() > 0 && source.getAbilityType().equals(AbilityType.SPELL)) {
SpecialAction specialAction = new ConvokeSpecialAction(unpaid);
specialAction.setControllerId(source.getControllerId());