From f0623d37c9cab859fb1d7f42b23e5aa96ee5a30a Mon Sep 17 00:00:00 2001 From: igoudt Date: Fri, 1 Sep 2017 22:48:42 +0200 Subject: [PATCH] some cleanups --- .../src/mage/cards/c/CastThroughTime.java | 13 ++++-------- .../src/mage/cards/t/TaigamOjutaiMaster.java | 20 ++++--------------- .../condition/common/BuybackCondition.java | 2 +- .../condition/common/SuspendedCondition.java | 17 ++++------------ .../common/XorLessLifeCondition.java | 4 ++-- .../effects/ContinuousEffectsList.java | 1 + Mage/src/main/java/mage/players/Library.java | 11 +++++----- .../common/CastFromGraveyardWatcher.java | 9 +++------ 8 files changed, 24 insertions(+), 53 deletions(-) diff --git a/Mage.Sets/src/mage/cards/c/CastThroughTime.java b/Mage.Sets/src/mage/cards/c/CastThroughTime.java index 1e841bb4f24..075c415df4a 100644 --- a/Mage.Sets/src/mage/cards/c/CastThroughTime.java +++ b/Mage.Sets/src/mage/cards/c/CastThroughTime.java @@ -27,8 +27,6 @@ */ package mage.cards.c; -import java.util.Iterator; -import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; @@ -46,6 +44,9 @@ import mage.game.stack.Spell; import mage.game.stack.StackObject; import mage.players.Player; +import java.util.Iterator; +import java.util.UUID; + /** * @author magenoxx_at_gmail.com @@ -118,13 +119,7 @@ class GainReboundEffect extends ContinuousEffectImpl { private void addReboundAbility(Card card, Ability source, Game game) { if (CastThroughTime.filter.match(card, game)) { - boolean found = false; - for (Ability ability : card.getAbilities()) { - if (ability instanceof ReboundAbility) { - found = true; - break; - } - } + boolean found = card.getAbilities().stream().anyMatch(ability -> ability instanceof ReboundAbility); if (!found) { Ability ability = new ReboundAbility(); game.getState().addOtherAbility(card, ability); diff --git a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java index d3ec450716f..3439b53e31a 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java +++ b/Mage.Sets/src/mage/cards/t/TaigamOjutaiMaster.java @@ -27,7 +27,6 @@ */ package mage.cards.t; -import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.DelayedTriggeredAbility; @@ -41,14 +40,7 @@ import mage.abilities.keyword.ReboundAbility; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SubLayer; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterSpell; import mage.filter.FilterStackObject; import mage.filter.predicate.Predicates; @@ -61,6 +53,8 @@ import mage.players.Player; import mage.target.targetpointer.FixedTarget; import mage.watchers.common.AttackedThisTurnWatcher; +import java.util.UUID; + /** * * @author spjspj @@ -187,13 +181,7 @@ class TaigamOjutaiMasterGainReboundEffect extends ContinuousEffectImpl { } private void addReboundAbility(Card card, Ability source, Game game) { - boolean found = false; - for (Ability ability : card.getAbilities()) { - if (ability instanceof ReboundAbility) { - found = true; - break; - } - } + boolean found = card.getAbilities().stream().anyMatch(ability -> ability instanceof ReboundAbility); if (!found) { Ability ability = new ReboundAbility(); game.getState().addOtherAbility(card, ability); diff --git a/Mage/src/main/java/mage/abilities/condition/common/BuybackCondition.java b/Mage/src/main/java/mage/abilities/condition/common/BuybackCondition.java index 6cc4f4aebea..20e914124b3 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/BuybackCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/BuybackCondition.java @@ -46,7 +46,7 @@ public enum BuybackCondition implements Condition { if (card != null) { return card.getAbilities().stream() .filter(a -> a instanceof BuybackAbility) - .anyMatch(b -> ((BuybackAbility) b).isActivated()); + .anyMatch(Ability::isActivated); } return false; } diff --git a/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java index 3642ce382bd..73113094a26 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/SuspendedCondition.java @@ -52,21 +52,12 @@ public enum SuspendedCondition implements Condition { @Override public boolean apply(Game game, Ability source) { Card card = game.getCard(source.getSourceId()); - boolean found = false; if (card != null) { - for (Ability ability: card.getAbilities()) { - if (ability instanceof SuspendAbility) { - found = true; - break; - } - } + boolean found = card.getAbilities().stream().anyMatch(ability -> ability instanceof SuspendAbility); + if (!found) { - for (Ability ability: game.getState().getAllOtherAbilities(source.getSourceId())) { - if (ability instanceof SuspendAbility) { - found = true; - break; - } - } + found = game.getState().getAllOtherAbilities(source.getSourceId()).stream().anyMatch(ability -> ability instanceof SuspendAbility); + } if (found) { if (game.getState().getZone(card.getId()) == Zone.EXILED && diff --git a/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java b/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java index a31c03f293b..3e3288622c3 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/XorLessLifeCondition.java @@ -62,7 +62,7 @@ public class XorLessLifeCondition implements Condition { } break; case CONTROLLER: - conditionApplies |= game.getPlayer(source.getControllerId()).getLife() <= amount; + conditionApplies = game.getPlayer(source.getControllerId()).getLife() <= amount; break; case TARGET_OPPONENT: //TODO: Implement this. @@ -78,7 +78,7 @@ public class XorLessLifeCondition implements Condition { } } } - conditionApplies |= maxLife <= amount; + conditionApplies = maxLife <= amount; break; } diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java index 2a32d808951..c8033bfc682 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffectsList.java @@ -78,6 +78,7 @@ public class ContinuousEffectsList extends ArrayList } public void removeEndOfCombatEffects() { + for (Iterator i = this.iterator(); i.hasNext(); ) { T entry = i.next(); if (entry.getDuration() == Duration.EndOfCombat) { diff --git a/Mage/src/main/java/mage/players/Library.java b/Mage/src/main/java/mage/players/Library.java index 34190ca4ec0..1b507192a45 100644 --- a/Mage/src/main/java/mage/players/Library.java +++ b/Mage/src/main/java/mage/players/Library.java @@ -27,15 +27,16 @@ */ package mage.players; -import java.io.Serializable; -import java.util.*; -import java.util.stream.Collectors; import mage.cards.Card; import mage.constants.Zone; import mage.filter.FilterCard; import mage.game.Game; import mage.util.RandomUtil; +import java.io.Serializable; +import java.util.*; +import java.util.stream.Collectors; + /** * @author BetaSteward_at_googlemail.com */ @@ -138,9 +139,7 @@ public class Library implements Serializable { public void putOnBottom(Card card, Game game) { if (card.getOwnerId().equals(playerId)) { card.setZone(Zone.LIBRARY, game); - if (library.contains(card.getId())) { - library.remove(card.getId()); - } + library.remove(card.getId()); library.add(card.getId()); } else { game.getPlayer(card.getOwnerId()).getLibrary().putOnBottom(card, game); diff --git a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java index cb3418baf3f..81a4704f892 100644 --- a/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CastFromGraveyardWatcher.java @@ -27,11 +27,6 @@ */ package mage.watchers.common; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; import mage.constants.WatcherScope; import mage.constants.Zone; import mage.game.Game; @@ -39,6 +34,8 @@ import mage.game.events.GameEvent; import mage.game.stack.Spell; import mage.watchers.Watcher; +import java.util.*; + /** * * @author LevelX2 @@ -66,7 +63,7 @@ public class CastFromGraveyardWatcher extends Watcher { if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getZone() == Zone.GRAVEYARD) { Spell spell = (Spell) game.getObject(event.getTargetId()); if (spell != null) { - HashSet zcc = spellsCastFromGraveyard.computeIfAbsent(spell.getSourceId(), k -> new HashSet<>()); + Set zcc = spellsCastFromGraveyard.computeIfAbsent(spell.getSourceId(), k -> new HashSet<>()); zcc.add(spell.getZoneChangeCounter(game)); }