Merge origin/master

Mage/src/main/java/mage/abilities/effects/RestrictionEffect.java

@@ -65,7 +65,7 @@ public abstract class RestrictionEffect extends ContinuousEffectImpl {
         return true;
     }
 
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         return true;
     }
 

Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackControllerAttachedEffect.java

@@ -63,7 +63,7 @@ public class CantAttackControllerAttachedEffect extends RestrictionEffect {
     }
 
     @Override
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         if (defenderId.equals(source.getControllerId())) {
             return false;
         }

Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackIfDefenderControlsPermanent.java

@@ -63,7 +63,7 @@ public class CantAttackIfDefenderControlsPermanent extends RestrictionEffect {
     }
 
     @Override
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         UUID defendingPlayerId;
         Player player = game.getPlayer(defenderId);
         if (player == null) {

Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackUnlessDefenderControllsPermanent.java

@@ -63,7 +63,7 @@ public class CantAttackUnlessDefenderControllsPermanent extends RestrictionEffec
     }
 
     @Override
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         UUID defendingPlayerId;
         Player player = game.getPlayer(defenderId);
         if (player == null) {

Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouAllEffect.java

@@ -65,7 +65,7 @@ public class CantAttackYouAllEffect extends RestrictionEffect {
     }
 
     @Override
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         return !defenderId.equals(source.getControllerId());
     }
 

Mage/src/main/java/mage/abilities/effects/common/combat/CantAttackYouOrPlaneswalkerAllEffect.java

@@ -65,7 +65,7 @@ public class CantAttackYouOrPlaneswalkerAllEffect extends RestrictionEffect {
     }
 
     @Override
-    public boolean canAttack(UUID defenderId, Ability source, Game game) {
+    public boolean canAttack(Permanent attacker, UUID defenderId, Ability source, Game game) {
         if (defenderId.equals(source.getControllerId())) {
             return false;
         }

Mage/src/main/java/mage/game/permanent/PermanentImpl.java

@@ -1108,7 +1108,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
                 return false;
             }
             for (Ability ability : effectEntry.getValue()) {
-                if (!effectEntry.getKey().canAttack(defenderId, ability, game)) {
+                if (!effectEntry.getKey().canAttack(this, defenderId, ability, game)) {
                     return false;
                 }
             }

Mage/src/main/java/mage/watchers/common/BlockedThisTurnWatcher.java

@@ -0,0 +1,79 @@
+/*
+ *  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.watchers.common;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import mage.MageObjectReference;
+import mage.constants.WatcherScope;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.watchers.Watcher;
+
+/**
+ *
+ * @author Quercitron
+ */
+public class BlockedThisTurnWatcher extends Watcher {
+
+    private final Set<MageObjectReference> blockedThisTurnCreatures;
+
+    public BlockedThisTurnWatcher() {
+        super("BlockedThisTurn", WatcherScope.GAME);
+        blockedThisTurnCreatures = new HashSet<>();
+    }
+
+    public BlockedThisTurnWatcher(final BlockedThisTurnWatcher watcher) {
+        super(watcher);
+        blockedThisTurnCreatures = new HashSet<>(watcher.blockedThisTurnCreatures);
+    }
+
+    @Override
+    public Watcher copy() {
+        return new BlockedThisTurnWatcher(this);
+    }
+
+    @Override
+    public void watch(GameEvent event, Game game) {
+        if (event.getType() == GameEvent.EventType.BLOCKER_DECLARED) {
+            this.blockedThisTurnCreatures.add(new MageObjectReference(event.getSourceId(), game));
+        }
+    }
+
+    public Set<MageObjectReference> getBlockedThisTurnCreatures() {
+        return this.blockedThisTurnCreatures;
+    }
+
+    @Override
+    public void reset() {
+        super.reset();
+        blockedThisTurnCreatures.clear();
+    }
+
+}