From b8d51e3037cefd43a6332c64201d250226d0cbf0 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 22:54:46 +0000 Subject: [PATCH] - Fixed Mana Breach. --- res/cardsfolder/mana_breach.txt | 2 +- .../AbilityFactory_ChangeZone.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/res/cardsfolder/mana_breach.txt b/res/cardsfolder/mana_breach.txt index 7f63badf9d4..c11ba51089f 100644 --- a/res/cardsfolder/mana_breach.txt +++ b/res/cardsfolder/mana_breach.txt @@ -4,7 +4,7 @@ Types:Enchantment Text:no text T:Mode$ SpellCast | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigBounceYou | TriggerDescription$ Whenever a player casts a spell, that player returns a land he or she controls to its owner's hand. T:Mode$ SpellCast | ValidCard$ Card.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigBounceOpp | Secondary$ True | TriggerDescription$ Whenever a player casts a spell, that player returns a land he or she controls to its owner's hand. -SVar:TrigBounceYou:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Land.YouCtrl | Mandatory$ True | Defined$ You | Hidden$ True +SVar:TrigBounceYou:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeNum$ 1 | ChangeType$ Land.YouCtrl | Mandatory$ True | Defined$ You | Hidden$ True SVar:TrigBounceOpp:AB$ ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ChangeNum$ 1 | ChangeType$ Land.YouDontCtrl | Mandatory$ True | Defined$ Opponent | Hidden$ True SVar:RemRandomDeck:True SVar:Rarity:Uncommon diff --git a/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java b/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java index d4dda9a6f43..188dbe0ceae 100644 --- a/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java +++ b/src/forge/card/abilityFactory/AbilityFactory_ChangeZone.java @@ -494,9 +494,11 @@ public class AbilityFactory_ChangeZone { Card card = af.getHostCard(); Target tgt = af.getAbTgt(); if (tgt != null){ - player = tgt.getTargetPlayers().get(0); - if (!player.canTarget(sa.getSourceCard())) - return; + if(!tgt.getTargetPlayers().isEmpty()) { + player = tgt.getTargetPlayers().get(0); + if (!player.canTarget(sa.getSourceCard())) + return; + } } String origin = params.get("Origin"); @@ -579,9 +581,11 @@ public class AbilityFactory_ChangeZone { Card card = af.getHostCard(); if (tgt != null){ - player = tgt.getTargetPlayers().get(0); - if (!player.canTarget(sa.getSourceCard())) - return; + if(!tgt.getTargetPlayers().isEmpty()) { + player = tgt.getTargetPlayers().get(0); + if (!player.canTarget(sa.getSourceCard())) + return; + } } String origin = params.get("Origin");