External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-07-10 17:15:16 +02:00
commit 99a553e814
141 changed files with 700 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage/src/main/java/mage/abilities/TriggeredAbilities.java
View file

@ -28,14 +28,6 @@
*/
package mage.abilities;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import mage.MageObject;
import mage.constants.Zone;
import mage.designations.Designation;
@ -45,6 +37,9 @@ import mage.game.events.NumberOfTriggersEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
/**
*
* @author BetaSteward_at_googlemail.com
@ -181,9 +176,7 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
}
public void removeAllGainedAbilities() {
for (String key : sources.keySet()) {
this.remove(key);
}
this.keySet().removeAll(sources.keySet());
sources.clear();
}
@ -201,9 +194,7 @@ public class TriggeredAbilities extends ConcurrentHashMap<String, TriggeredAbili
keysToRemove.add(entry.getKey());
}
}
for (String key : keysToRemove) {
remove(key);
}
this.keySet().removeAll(keysToRemove);
}
public TriggeredAbilities copy() {

7
Mage/src/main/java/mage/abilities/effects/common/CopySpellForEachItCouldTargetEffect.java
View file

@ -46,8 +46,8 @@ import mage.util.TargetAddress;
import java.util.*;
/**
* @author duncant
* @param <T>
* @author duncant
*/
public abstract class CopySpellForEachItCouldTargetEffect<T extends MageItem> extends OneShotEffect {
@ -191,10 +191,7 @@ public abstract class CopySpellForEachItCouldTargetEffect<T extends MageItem> ex
madeACopy = true;
}
}
for (UUID idToDelete : toDelete) {
targetCopyMap.remove(idToDelete);
}
targetCopyMap.keySet().removeAll((toDelete));
}
}
}

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

@ -27,15 +27,17 @@
*/
package mage.abilities.effects.common.combat;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.RestrictionEffect;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author LevelX2
@ -46,7 +48,7 @@ public class CantAttackYouAllEffect extends RestrictionEffect {
private final boolean alsoPlaneswalker;
public CantAttackYouAllEffect(Duration duration) {
this(duration, new FilterCreaturePermanent("creatures"));
this(duration, StaticFilters.FILTER_PERMANENT_CREATURES);
}
public CantAttackYouAllEffect(Duration duration, FilterCreaturePermanent filter) {

13
Mage/src/main/java/mage/filter/StaticFilters.java
View file

@ -7,15 +7,7 @@ package mage.filter;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.filter.common.FilterArtifactCard;
import mage.filter.common.FilterArtifactCreaturePermanent;
import mage.filter.common.FilterControlledArtifactPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterCreatureSpell;
import mage.filter.common.FilterNonlandCard;
import mage.filter.common.FilterNonlandPermanent;
import mage.filter.common.*;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
@ -28,6 +20,9 @@ import mage.filter.predicate.permanent.TokenPredicate;
*/
public final class StaticFilters {
public static final FilterSpiritOrArcaneCard SPIRIT_OR_ARCANE_CARD = new FilterSpiritOrArcaneCard();
public static final FilterArtifactCard FILTER_CARD_ARTIFACT = new FilterArtifactCard();
public static final FilterNonlandCard FILTER_CARD_NON_LAND = new FilterNonlandCard();
public static final FilterNonlandCard FILTER_CARD_A_NON_LAND = new FilterNonlandCard("a nonland card");