From 8d404138c319d626d34ad4dac8b3a92d2e328ce9 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Wed, 3 Aug 2011 20:20:15 +0400
Subject: [PATCH] Fixed Heavy Arbalest. Fixed FilterCreaturePermanent.

---
 .../src/mage/sets/scarsofmirrodin/HeavyArbalest.java  |  2 +-
 .../mage/filter/common/FilterCreaturePermanent.java   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java
index c7a25fb0df..2d50f5bfab 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/HeavyArbalest.java
@@ -111,7 +111,7 @@ class SkipUntapSourceEffect extends ReplacementEffectImpl<SkipUntapSourceEffect>
     public boolean applies(GameEvent event, Ability source, Game game) {
         if (game.getTurn().getStepType() == PhaseStep.UNTAP
                 && event.getType() == EventType.UNTAP
-                && event.getTargetId().equals(source.getId())) {
+                && event.getTargetId().equals(source.getSourceId())) {
             return true;
         }
         return false;
diff --git a/Mage/src/mage/filter/common/FilterCreaturePermanent.java b/Mage/src/mage/filter/common/FilterCreaturePermanent.java
index fc9437eab6..43564d2669 100644
--- a/Mage/src/mage/filter/common/FilterCreaturePermanent.java
+++ b/Mage/src/mage/filter/common/FilterCreaturePermanent.java
@@ -73,15 +73,12 @@ public class FilterCreaturePermanent<T extends FilterCreaturePermanent<T>> exten
 		if (!super.match(permanent))
 			return notFilter;
 
-		if (useAttacking && permanent.isAttacking() != attacking) {
-            if (useBlocking) {
-                if ((permanent.getBlocking() > 0) != blocking)
-                    return notFilter;
-            } else
-                return notFilter;
+		if (useAttacking) {
+			if (permanent.isAttacking() == attacking) {
+				return !notFilter;
+			}
         }
 
-
 		if (useBlocking && (permanent.getBlocking() > 0) != blocking)
 			return notFilter;