Some cleanups/remanes for attack/block restrict effects.

Mage/src/mage/abilities/decorator/ConditionalRestrictionEffect.java

@@ -33,7 +33,6 @@ import mage.abilities.condition.FixedCondition;
 import mage.abilities.condition.LockedInCondition;
 import mage.abilities.effects.RestrictionEffect;
 import mage.constants.Duration;
-import mage.constants.EffectType;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
@@ -56,7 +55,6 @@ public class ConditionalRestrictionEffect extends RestrictionEffect {
 
     public ConditionalRestrictionEffect(Duration duration, RestrictionEffect effect, Condition condition, RestrictionEffect otherwiseEffect) {
         super(duration);
-        this.effectType = EffectType.RESTRICTION;
         this.effect = effect;
         this.baseCondition = condition;
         this.otherwiseEffect = otherwiseEffect;

Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerAllEffect.java

@@ -40,11 +40,11 @@ import mage.game.permanent.Permanent;
  *
  * @author LevelX2
  */
-public class CantAttackAllAnyPlayerEffect extends RestrictionEffect {
+public class CantAttackAnyPlayerAllEffect extends RestrictionEffect {
 
     private final FilterCreaturePermanent filter;
 
-    public CantAttackAllAnyPlayerEffect(Duration duration, FilterCreaturePermanent filter) {
+    public CantAttackAnyPlayerAllEffect(Duration duration, FilterCreaturePermanent filter) {
         super(duration);
         this.filter = filter;
         StringBuilder sb = new StringBuilder(filter.getMessage()).append(" can't attack");
@@ -59,7 +59,7 @@ public class CantAttackAllAnyPlayerEffect extends RestrictionEffect {
         staticText = sb.toString();        
     }
 
-    public CantAttackAllAnyPlayerEffect(final CantAttackAllAnyPlayerEffect effect) {
+    public CantAttackAnyPlayerAllEffect(final CantAttackAnyPlayerAllEffect effect) {
         super(effect);
         this.filter = effect.filter;
     }
@@ -75,8 +75,8 @@ public class CantAttackAllAnyPlayerEffect extends RestrictionEffect {
     }
 
     @Override
-    public CantAttackAllAnyPlayerEffect copy() {
-        return new CantAttackAllAnyPlayerEffect(this);
+    public CantAttackAnyPlayerAllEffect copy() {
+        return new CantAttackAnyPlayerAllEffect(this);
     }
 
 }

Mage/src/mage/abilities/effects/common/combat/CantAttackAnyPlayerSourceEffect.java

@@ -39,13 +39,13 @@ import mage.game.permanent.Permanent;
  * 
  * @author BetaSteward_at_googlemail.com
  */
-public class CantAttackAllSourceEffect extends RestrictionEffect {
+public class CantAttackAnyPlayerSourceEffect extends RestrictionEffect {
 
-    public CantAttackAllSourceEffect(Duration duration) {
+    public CantAttackAnyPlayerSourceEffect(Duration duration) {
         super(duration);
     }
 
-    public CantAttackAllSourceEffect(final CantAttackAllSourceEffect effect) {
+    public CantAttackAnyPlayerSourceEffect(final CantAttackAnyPlayerSourceEffect effect) {
         super(effect);
     }
 
@@ -60,8 +60,8 @@ public class CantAttackAllSourceEffect extends RestrictionEffect {
     }
 
     @Override
-    public CantAttackAllSourceEffect copy() {
-        return new CantAttackAllSourceEffect(this);
+    public CantAttackAnyPlayerSourceEffect copy() {
+        return new CantAttackAnyPlayerSourceEffect(this);
     }
 
 }

Mage/src/mage/abilities/effects/common/combat/CantAttackBlockAllEffect.java

@@ -0,0 +1,85 @@
+/*
+ *  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 mage.abilities.Ability;
+import mage.abilities.effects.RestrictionEffect;
+import mage.constants.Duration;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class CantAttackBlockAllEffect extends RestrictionEffect {
+
+    private final FilterCreaturePermanent filter;
+
+    public CantAttackBlockAllEffect(Duration duration, FilterCreaturePermanent filter) {
+        super(duration);
+        this.filter = filter;
+        StringBuilder sb = new StringBuilder(filter.getMessage()).append(" can't attack or block");
+        if (!duration.toString().isEmpty()) {
+            sb.append(" ");
+            if (duration.equals(Duration.EndOfTurn)) {
+                sb.append(" this turn");
+            } else {
+                sb.append(" ").append(duration.toString());
+            }
+        }
+        staticText = sb.toString();
+    }
+
+    public CantAttackBlockAllEffect(final CantAttackBlockAllEffect effect) {
+        super(effect);
+        this.filter = effect.filter;
+    }
+
+    @Override
+    public boolean applies(Permanent permanent, Ability source, Game game) {
+        return filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
+    }
+
+    @Override
+    public boolean canAttack(Game game) {
+        return false;
+    }
+
+    @Override
+    public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
+        return false;
+    }
+
+    @Override
+    public CantAttackBlockAllEffect copy() {
+        return new CantAttackBlockAllEffect(this);
+    }
+
+}