From 470fe5fba45b580da8b308657503afbc4b13ca83 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Mon, 25 Oct 2021 09:11:22 +0300 Subject: [PATCH] - No need to sort cards by ID for FlipOntoBattlefieldEffect --- .../ability/effects/FlipOntoBattlefieldEffect.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/FlipOntoBattlefieldEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipOntoBattlefieldEffect.java index c53a8f30923..98ced261189 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/FlipOntoBattlefieldEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/FlipOntoBattlefieldEffect.java @@ -4,7 +4,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.Lists; import forge.game.Game; import forge.game.ability.SpellAbilityEffect; -import forge.game.card.*; +import forge.game.card.Card; +import forge.game.card.CardCollection; +import forge.game.card.CardCollectionView; +import forge.game.card.CardLists; import forge.game.player.Player; import forge.game.spellability.SpellAbility; import forge.game.zone.ZoneType; @@ -13,8 +16,6 @@ import forge.util.Localizer; import forge.util.MyRandom; import java.util.ArrayList; -import java.util.Collections; -import java.util.Comparator; public class FlipOntoBattlefieldEffect extends SpellAbilityEffect { @Override @@ -117,13 +118,6 @@ public class FlipOntoBattlefieldEffect extends SpellAbilityEffect { } )); - Collections.sort(cardsOTB, new Comparator() { - @Override - public int compare(Card c0, Card c1) { - return c0.getId() - c1.getId(); - } - }); - int loc = cardsOTB.indexOf(c); if (direction < 0 && loc > 0) { return cardsOTB.get(loc - 1);