From 81c4ae5d84fd88fb90dc058375a25ea0810cff23 Mon Sep 17 00:00:00 2001 From: Brian Hill Date: Wed, 10 Jun 2015 22:37:28 -0400 Subject: [PATCH] Incorporate feedback from LevelX2 --- .../mage/sets/urzasdestiny/Repercussion.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/sets/urzasdestiny/Repercussion.java b/Mage.Sets/src/mage/sets/urzasdestiny/Repercussion.java index 2a623ffcf97..9140b797f53 100644 --- a/Mage.Sets/src/mage/sets/urzasdestiny/Repercussion.java +++ b/Mage.Sets/src/mage/sets/urzasdestiny/Repercussion.java @@ -86,15 +86,17 @@ class RepercussionTriggeredAbility extends TriggeredAbilityImpl { super(ability); } + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.DAMAGED_CREATURE; + } + @Override public boolean checkTrigger(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.DAMAGED_CREATURE) { - MageObject eventSource = game.getObject(event.getSourceId()); - this.getEffects().get(0).setValue(PLAYER_DAMAGE_AMOUNT_KEY, event.getAmount()); - this.getEffects().get(0).setTargetPointer(new FixedTarget(game.getControllerId(eventSource.getId()))); - return true; - } - return false; + MageObject eventSource = game.getObject(event.getSourceId()); + this.getEffects().get(0).setValue(PLAYER_DAMAGE_AMOUNT_KEY, event.getAmount()); + this.getEffects().get(0).setTargetPointer(new FixedTarget(game.getControllerId(eventSource.getId()))); + return true; } @Override @@ -125,7 +127,7 @@ class RepercussionEffect extends OneShotEffect { if (playerDamage != null && targetId != null) { Player player = game.getPlayer(targetId); if (player != null) { - player.damage(playerDamage, targetId, game, false, true); + player.damage(playerDamage, source.getSourceId(), game, false, true); return true; } }