From 8c4d4e29ec1cadc43ed3f9699bd8034824bd041a Mon Sep 17 00:00:00 2001
From: Skyler Sell <skyler91@gmail.com>
Date: Wed, 13 Jan 2016 13:39:26 -0800
Subject: [PATCH] Add Carom. Razia, Boros Archangel - Fix bug where server log
displays error when second target no longer exists (such as a token that has
been destroyed).
---
.../src/mage/sets/planechase/RaziaBorosArchangel.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java
index be5502dbe7..49aa60f7b7 100644
--- a/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java
+++ b/Mage.Sets/src/mage/sets/planechase/RaziaBorosArchangel.java
@@ -82,7 +82,7 @@ public class RaziaBorosArchangel extends CardImpl {
target.setTargetTag(1);
ability.addTarget(target);
- FilterCreaturePermanent filter = new FilterCreaturePermanent("creature (damage is redirected to)");
+ FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature (damage is redirected to)");
filter.add(new AnotherTargetPredicate(2));
target = new TargetCreaturePermanent(filter);
target.setTargetTag(2);
@@ -133,9 +133,11 @@ class RaziaBorosArchangelEffect extends RedirectionEffect {
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
if (event.getTargetId().equals(getTargetPointer().getFirst(game, source))) {
- if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) {
- redirectTarget = source.getTargets().get(1);
- return true;
+ if (game.getControllerId(redirectToObject.getSourceId()) != null) {
+ if (redirectToObject.equals(new MageObjectReference(source.getTargets().get(1).getFirstTarget(), game))) {
+ redirectTarget = source.getTargets().get(1);
+ return true;
+ }
}
}
return false;