* Added 3 cards from Ravinca City of Gold set.

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

@@ -1,7 +1,29 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ *  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;
 

Mage/src/main/java/mage/filter/Filter.java

@@ -27,11 +27,10 @@
  */
 package mage.filter;
 
+import java.io.Serializable;
 import mage.filter.predicate.Predicate;
 import mage.game.Game;
 
-import java.io.Serializable;
-
 /**
  * @param <E>
  * @author BetaSteward_at_googlemail.com
@@ -45,7 +44,7 @@ public interface Filter<E> extends Serializable {
 
     boolean match(E o, Game game);
 
-    void add(Predicate predicate);
+    Filter<E> add(Predicate predicate);
 
     boolean checkObjectClass(Object object);
 

Mage/src/main/java/mage/filter/FilterImpl.java

@@ -65,8 +65,9 @@ public abstract class FilterImpl<E> implements Filter<E> {
     }
 
     @Override
-    public final void add(Predicate predicate) {
+    public final Filter add(Predicate predicate) {
         predicates.add(predicate);
+        return this;
     }
 
     @Override

Mage/src/main/java/mage/target/targetpointer/ThirdTargetPointer.java

@@ -0,0 +1,87 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package mage.target.targetpointer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import mage.abilities.Ability;
+import mage.cards.Card;
+import mage.game.Game;
+
+/**
+ *
+ * @author Ludwig.Hirth
+ */
+public class ThirdTargetPointer implements TargetPointer {
+
+    private Map<UUID, Integer> zoneChangeCounter = new HashMap<>();
+
+    public static ThirdTargetPointer getInstance() {
+        return new ThirdTargetPointer();
+    }
+
+    public ThirdTargetPointer() {
+    }
+
+    public ThirdTargetPointer(ThirdTargetPointer targetPointer) {
+        this.zoneChangeCounter = new HashMap<>();
+        for (Map.Entry<UUID, Integer> entry : targetPointer.zoneChangeCounter.entrySet()) {
+            this.zoneChangeCounter.put(entry.getKey(), entry.getValue());
+        }
+    }
+
+    @Override
+    public void init(Game game, Ability source) {
+        if (source.getTargets().size() > 2) {
+            for (UUID target : source.getTargets().get(2).getTargets()) {
+                Card card = game.getCard(target);
+                if (card != null) {
+                    this.zoneChangeCounter.put(target, card.getZoneChangeCounter(game));
+                }
+            }
+        }
+    }
+
+    @Override
+    public List<UUID> getTargets(Game game, Ability source) {
+        ArrayList<UUID> target = new ArrayList<>();
+        if (source.getTargets().size() > 2) {
+            for (UUID targetId : source.getTargets().get(2).getTargets()) {
+                Card card = game.getCard(targetId);
+                if (card != null && zoneChangeCounter.containsKey(targetId)
+                        && card.getZoneChangeCounter(game) != zoneChangeCounter.get(targetId)) {
+                    continue;
+                }
+                target.add(targetId);
+            }
+        }
+        return target;
+    }
+
+    @Override
+    public UUID getFirst(Game game, Ability source) {
+        if (source.getTargets().size() > 2) {
+            UUID targetId = source.getTargets().get(2).getFirstTarget();
+            if (zoneChangeCounter.containsKey(targetId)) {
+                Card card = game.getCard(targetId);
+                if (card != null && zoneChangeCounter.containsKey(targetId)
+                        && card.getZoneChangeCounter(game) != zoneChangeCounter.get(targetId)) {
+                    return null;
+                }
+            }
+            return targetId;
+        }
+        return null;
+    }
+
+    @Override
+    public TargetPointer copy() {
+        return new ThirdTargetPointer(this);
+    }
+}