From 1208c7d3591eee905735025bbf75e6748c4ceb27 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Sun, 20 May 2012 17:42:05 +0400
Subject: [PATCH] Inquisitor's Flail fix

---
 .../mage/sets/innistrad/InquisitorsFlail.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java b/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java
index b6f1a4928a6..811b4260c79 100644
--- a/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java
+++ b/Mage.Sets/src/mage/sets/innistrad/InquisitorsFlail.java
@@ -37,6 +37,7 @@ import mage.abilities.effects.ReplacementEffectImpl;
 import mage.abilities.keyword.EquipAbility;
 import mage.cards.CardImpl;
 import mage.game.Game;
+import mage.game.events.DamagedEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 
@@ -93,13 +94,16 @@ class InquisitorsFlailEffect extends ReplacementEffectImpl<InquisitorsFlailEffec
             case DAMAGE_CREATURE:
             case DAMAGE_PLAYER:
             case DAMAGE_PLANESWALKER:
-                Permanent equipment = game.getPermanent(source.getSourceId());
-                if (equipment != null && equipment.getAttachedTo() != null) {
-                    UUID attachedTo = equipment.getAttachedTo();
-                    if (event.getSourceId().equals(attachedTo)) {
-                        event.setAmount(event.getAmount() * 2);
-                    } else if (event.getTargetId().equals(attachedTo)) {
-                        event.setAmount(event.getAmount() * 2);
+                if (((DamagedEvent) event).isCombatDamage()) {
+                    Permanent equipment = game.getPermanent(source.getSourceId());
+                    if (equipment != null && equipment.getAttachedTo() != null) {
+                        UUID attachedTo = equipment.getAttachedTo();
+                        if (event.getSourceId().equals(attachedTo)) {
+                            event.setAmount(event.getAmount() * 2);
+                        } else if (event.getTargetId().equals(attachedTo)) {
+                            event.setAmount(event.getAmount() * 2);
+                        }
+                        return true;
                     }
                 }
         }