From 81c4259cfe6ed887c2e825791478cdc5fab2d2f0 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 20 Oct 2013 16:46:23 +0200
Subject: [PATCH] * Fixed must be blocked by all creatures if able effects to
 take only place if the creature with the effect also attacks (fixes #361).

---
 .../MustBeBlockedByAllAttachedEffect.java     |  7 +-
 .../MustBeBlockedByAllSourceEffect.java       |  6 +-
 .../MustBeBlockedByAllTargetEffect.java       | 84 +++++++++++++++++++
 3 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java

diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
index db9c5afc6f..2209c62b66 100644
--- a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllAttachedEffect.java
@@ -62,9 +62,12 @@ public class MustBeBlockedByAllAttachedEffect extends RequirementEffect<MustBeBl
     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);
+            Permanent attachedCreature = game.getPermanent(attachment.getAttachedTo());
+            if (attachedCreature != null && attachedCreature.isAttacking()) {
+                return permanent.canBlock(attachment.getAttachedTo(), game);
+            }
         }
-        return true;
+        return false;
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
index b8ecc94367..f1bb3ef15c 100644
--- a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllSourceEffect.java
@@ -56,7 +56,11 @@ public class MustBeBlockedByAllSourceEffect extends RequirementEffect<MustBeBloc
 
     @Override
     public boolean applies(Permanent permanent, Ability source, Game game) {
-        return permanent.canBlock(source.getSourceId(), game);
+        Permanent sourceCreature = game.getPermanent(source.getSourceId());
+        if (sourceCreature != null && sourceCreature.isAttacking()) {
+            return permanent.canBlock(source.getSourceId(), game);
+        }
+        return false;
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java
new file mode 100644
index 0000000000..f063265a6c
--- /dev/null
+++ b/Mage/src/mage/abilities/effects/common/combat/MustBeBlockedByAllTargetEffect.java
@@ -0,0 +1,84 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+
+package mage.abilities.effects.common.combat;
+
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.abilities.effects.RequirementEffect;
+import mage.constants.Duration;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class MustBeBlockedByAllTargetEffect extends RequirementEffect<MustBeBlockedByAllTargetEffect> {
+
+    public MustBeBlockedByAllTargetEffect(Duration duration) {
+        super(duration);
+        staticText =  new StringBuilder("All creatures able to block target creature ")
+                .append(this.getDuration().equals(Duration.EndOfTurn) ? "this turn ":"")
+                .append("do so").toString();
+    }
+
+    public MustBeBlockedByAllTargetEffect(final MustBeBlockedByAllTargetEffect effect) {
+        super(effect);
+    }
+
+    @Override
+    public boolean applies(Permanent permanent, Ability source, Game game) {
+        Permanent sourceCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source));
+        if (sourceCreature != null && sourceCreature.isAttacking()) {
+            return permanent.canBlock(this.getTargetPointer().getFirst(game, source), game);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean mustAttack(Game game) {
+        return false;
+    }
+
+    @Override
+    public boolean mustBlock(Game game) {
+        return true;
+    }
+
+    @Override
+    public UUID mustBlockAttacker(Ability source, Game game) {
+        return this.getTargetPointer().getFirst(game, source);
+    }
+
+    @Override
+    public MustBeBlockedByAllTargetEffect copy() {
+        return new MustBeBlockedByAllTargetEffect(this);
+    }
+
+}