github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix #3481 - Swans of Bryn Argoll didn't realize an emblem can deal damage to it, so it couldn't find the source of the damage when Chandra, Torch of Defiance's emblem deals damage.

Browse source
This commit is contained in:
Will Hall 2017-06-09 20:34:14 -07:00
parent df35f03d2d
commit 9247d34d8a
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Mage.Sets/src/mage/cards/s/SwansOfBrynArgoll.java
View file

@ -42,6 +42,7 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.Zone; import mage.constants.Zone;
import mage.game.Game; import mage.game.Game;
import mage.game.command.CommandObject;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -100,6 +101,7 @@ class SwansOfBrynArgollEffect extends PreventionEffectImpl {
if (sourceOfDamage != null) { if (sourceOfDamage != null) {
Spell spell = game.getStack().getSpell(sourceOfDamage.getId()); Spell spell = game.getStack().getSpell(sourceOfDamage.getId());
Permanent permanent = game.getPermanentOrLKIBattlefield(sourceOfDamage.getId()); Permanent permanent = game.getPermanentOrLKIBattlefield(sourceOfDamage.getId());
CommandObject emblem = (CommandObject)game.getEmblem(sourceOfDamage.getId());
if (spell != null) { if (spell != null) {
Player controllerOfSpell = game.getPlayer(spell.getControllerId()); Player controllerOfSpell = game.getPlayer(spell.getControllerId());
controllerOfSpell.drawCards(preventionEffectData.getPreventedDamage(), game); controllerOfSpell.drawCards(preventionEffectData.getPreventedDamage(), game);
@ -110,6 +112,11 @@ class SwansOfBrynArgollEffect extends PreventionEffectImpl {
controllerOfPermanent.drawCards(preventionEffectData.getPreventedDamage(), game); controllerOfPermanent.drawCards(preventionEffectData.getPreventedDamage(), game);
passed = true; passed = true;
} }
if (emblem != null) {
Player controllerOfEmblem = game.getPlayer(emblem.getControllerId());
controllerOfEmblem.drawCards(preventionEffectData.getPreventedDamage(), game);
passed = true;
}
if (!passed) { if (!passed) {
// Needed for cards that do damage from hand e.g. Gempalm Incinerator // Needed for cards that do damage from hand e.g. Gempalm Incinerator
Card cardSource = game.getCard(event.getSourceId()); Card cardSource = game.getCard(event.getSourceId());