diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java index 35a67b46711..8600bab84d4 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/KumanosBlessing.java @@ -38,12 +38,7 @@ import mage.abilities.effects.common.AttachEffect; import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -54,6 +49,7 @@ import mage.target.TargetPermanent; import mage.target.common.TargetCreaturePermanent; import mage.watchers.Watcher; + /** * * @author LevelX2 @@ -159,9 +155,8 @@ class DamagedByEnchantedWatcher extends Watcher { if (enchantment != null && enchantment.getAttachedTo() != null) { if (enchantment.getAttachedTo().equals(event.getSourceId())) { MageObjectReference mor = new MageObjectReference(event.getTargetId(), game); - if (!damagedCreatures.contains(mor)) { damagedCreatures.add(mor); - } + } } } diff --git a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamosMeddling.java b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamosMeddling.java index 650d87ccce4..a6cd389624b 100644 --- a/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamosMeddling.java +++ b/Mage.Sets/src/mage/sets/betrayersofkamigawa/MinamosMeddling.java @@ -46,6 +46,9 @@ import mage.game.stack.Spell; import mage.players.Player; import mage.target.TargetSpell; +import java.util.UUID; + + /** * * @author LevelX2 @@ -103,7 +106,7 @@ class MinamosMeddlingCounterTargetEffect extends OneShotEffect { for (SpellAbility spellAbility : spell.getSpellAbilities()) { if (spellAbility.getSpellAbilityType().equals(SpellAbilityType.SPLICE)) { for (Card card: spellController.getHand().getCards(game)) { - if (card.getName().equals(spellAbility.getCardName()) && !cardsToDiscard.contains(card.getId())) { + if (card.getName().equals(spellAbility.getCardName())) { cardsToDiscard.add(card); } } diff --git a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java index b17c9bef2eb..6488dad0342 100644 --- a/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java +++ b/Mage.Sets/src/mage/sets/bornofthegods/SpiritOfTheLabyrinth.java @@ -34,16 +34,12 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.cards.CardImpl; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.Rarity; -import mage.constants.WatcherScope; -import mage.constants.Zone; +import mage.constants.*; import mage.game.Game; import mage.game.events.GameEvent; import mage.watchers.Watcher; + /** * * @author LevelX2 @@ -96,9 +92,8 @@ class SpiritOfTheLabyrinthWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.DREW_CARD ) { - if (!playersThatDrewCard.contains(event.getPlayerId())) { playersThatDrewCard.add(event.getPlayerId()); - } + } } diff --git a/Mage.Sets/src/mage/sets/conspiracytakethecrown/LeovoldEmissaryOfTrest.java b/Mage.Sets/src/mage/sets/conspiracytakethecrown/LeovoldEmissaryOfTrest.java index e0a08a99236..7f372c4baf4 100644 --- a/Mage.Sets/src/mage/sets/conspiracytakethecrown/LeovoldEmissaryOfTrest.java +++ b/Mage.Sets/src/mage/sets/conspiracytakethecrown/LeovoldEmissaryOfTrest.java @@ -43,6 +43,7 @@ import mage.game.permanent.Permanent; import mage.players.Player; import mage.watchers.Watcher; + /** * * @author maxlebedev @@ -99,9 +100,8 @@ class LeovoldEmissaryOfTrestWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { if (event.getType() == GameEvent.EventType.DREW_CARD ) { - if (!playersThatDrewCard.contains(event.getPlayerId())) { playersThatDrewCard.add(event.getPlayerId()); - } + } } diff --git a/Mage/src/main/java/mage/util/RandomUtil.java b/Mage/src/main/java/mage/util/RandomUtil.java index 3881b61e4aa..e6ad5820213 100644 --- a/Mage/src/main/java/mage/util/RandomUtil.java +++ b/Mage/src/main/java/mage/util/RandomUtil.java @@ -8,21 +8,18 @@ import java.util.concurrent.ThreadLocalRandom; */ public class RandomUtil { - private final static ThreadLocalRandom random = ThreadLocalRandom.current(); - public static Random getRandom() { - return random; - } + public static Random getRandom() {return ThreadLocalRandom.current();} public static int nextInt() { - return random.nextInt(); + return ThreadLocalRandom.current().nextInt(); } public static int nextInt(int max) { - return random.nextInt(max); + return ThreadLocalRandom.current().nextInt(max); } public static boolean nextBoolean() { - return random.nextBoolean(); + return ThreadLocalRandom.current().nextBoolean(); } }