From db1521d30c6d7e32b5592732d145fb62fc3d137c Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Tue, 8 Oct 2013 17:12:04 +0200
Subject: [PATCH] * Fixed some problems with blocking requirements (fixes
 #355).

---
 .../src/mage/sets/avacynrestored/RevengeOfTheHunted.java  | 2 +-
 Mage.Sets/src/mage/sets/worldwake/FeralContest.java       | 7 +++----
 Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java       | 5 ++++-
 .../common/combat/MustBeBlockedByAllAttachedEffect.java   | 4 ++++
 .../common/combat/MustBeBlockedByAllSourceEffect.java     | 2 +-
 .../common/combat/MustBeBlockedByTargetSourceEffect.java  | 8 +++++---
 Mage/src/mage/game/combat/Combat.java                     | 4 ++--
 Mage/src/mage/game/permanent/PermanentImpl.java           | 4 ++++
 8 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java
index d3a25e4b53..be22708f6c 100644
--- a/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java
+++ b/Mage.Sets/src/mage/sets/avacynrestored/RevengeOfTheHunted.java
@@ -91,7 +91,7 @@ class RevengeOfTheHuntedEffect extends RequirementEffect<RevengeOfTheHuntedEffec
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        return true;
+        return permanent.canBlock(source.getFirstTarget(), game);
     }
 
     @Override
diff --git a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java
index e29afe6530..bcc875789e 100644
--- a/Mage.Sets/src/mage/sets/worldwake/FeralContest.java
+++ b/Mage.Sets/src/mage/sets/worldwake/FeralContest.java
@@ -92,10 +92,9 @@ class FeralContestEffect extends RequirementEffect<FeralContestEffect> {
     }
 
     @Override
-    public boolean applies(Permanent permanent, Ability source, Game game) {
-        Permanent creature = game.getPermanent(source.getTargets().get(1).getFirstTarget());
-        if (creature != null) {
-            return true;
+    public boolean applies(Permanent permanent, Ability source, Game game) {        
+        if (permanent.getId().equals(source.getTargets().get(1).getFirstTarget())) {
+            return permanent.canBlock(source.getFirstTarget(), game);
         }
         return false;
     }
diff --git a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java
index 90aa89417e..c5d66f03b1 100644
--- a/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java
+++ b/Mage.Sets/src/mage/sets/zendikar/GrapplingHook.java
@@ -96,7 +96,10 @@ class GrapplingHookEffect extends RequirementEffect<GrapplingHookEffect> {
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
         if (permanent.getId().equals(source.getFirstTarget())) {
-            return true;
+            Permanent equipment = game.getPermanent(source.getSourceId());
+            if (equipment != null && equipment.getAttachedTo() != null) {
+                return permanent.canBlock(equipment.getAttachedTo(), game);
+            }
         }
         return false;
     }
diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
index c1ba763d6d..db9c5afc6f 100644
--- a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
@@ -60,6 +60,10 @@ public class MustBeBlockedByAllAttachedEffect extends RequirementEffect<MustBeBl
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
+        Permanent attachment = game.getPermanent(source.getSourceId());
+        if (attachment != null && attachment.getAttachedTo() != null) {
+            return permanent.canBlock(attachment.getAttachedTo(), game);
+        }
         return true;
     }
 
diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
index 0e3b50ffb7..b8ecc94367 100644
--- a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
@@ -56,7 +56,7 @@ public class MustBeBlockedByAllSourceEffect extends RequirementEffect<MustBeBloc
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        return true;
+        return permanent.canBlock(source.getSourceId(), game);
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
index 4e2df4033f..51acdd2003 100644
--- a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByTargetSourceEffect.java
@@ -56,9 +56,11 @@ public class MustBeBlockedByTargetSourceEffect extends RequirementEffect<MustBeB
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        Permanent creature = game.getPermanent(source.getFirstTarget());
-        if (creature != null && creature.getId().equals(permanent.getId())) {
-            return true;
+        if (permanent.getId().equals(source.getFirstTarget())) {
+            Permanent blocker = game.getPermanent(source.getFirstTarget());
+            if (blocker != null && blocker.canBlock(source.getSourceId(), game)) {
+                return true;
+            }
         }
         return false;
     }
diff --git a/Mage/src/mage/game/combat/Combat.java b/Mage/src/mage/game/combat/Combat.java
index 7c79c5594f..3d0382c0ff 100644
--- a/Mage/src/mage/game/combat/Combat.java
+++ b/Mage/src/mage/game/combat/Combat.java
@@ -374,7 +374,7 @@ public class Combat implements Serializable, Copyable<Combat> {
          * and the requirement, so that's the only option.
          */
         for (Permanent creature : game.getBattlefield().getActivePermanents(filterBlockers, player.getId(), game)) {
-            if (game.getOpponents(attackerId).contains(creature.getControllerId())) {
+                if (game.getOpponents(attackerId).contains(creature.getControllerId())) {
                 for (Map.Entry entry : game.getContinuousEffects().getApplicableRequirementEffects(creature, game).entrySet()) {
                     RequirementEffect effect = (RequirementEffect)entry.getKey();
                     if (effect.mustBlock(game)) {
@@ -400,7 +400,7 @@ public class Combat implements Serializable, Copyable<Combat> {
     }
 
     public boolean checkBlockRequirementsAfter(Player player, Player controller, Game game) {
-        // Get one time a list of all opponents in range
+        // Get once a list of all opponents in range
         Set<UUID> opponents = game.getOpponents(attackerId);
         //20101001 - 509.1c
         // map with attackers (UUID) that must be blocked by at least one blocker and a set of all creatures that can block it and don't block yet
diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java
index 2b6d375752..fccd958b58 100644
--- a/Mage/src/mage/game/permanent/PermanentImpl.java
+++ b/Mage/src/mage/game/permanent/PermanentImpl.java
@@ -869,6 +869,10 @@ public abstract class PermanentImpl<T extends PermanentImpl<T>> extends CardImpl
             return false;
         }
         Permanent attacker = game.getPermanent(attackerId);
+        // controller of attacking permanent must be an opponent
+        if (!game.getOpponents(this.getControllerId()).contains(attacker.getControllerId())) {
+            return false;
+        }
         //20101001 - 509.1b
         for (Map.Entry entry: game.getContinuousEffects().getApplicableRestrictionEffects(this, game).entrySet()) {
             RestrictionEffect effect = (RestrictionEffect)entry.getKey();