refactor: improved usage of getOpponents to ignore leaved players in …

…one short effects
magefree · Feb 3, 2025 · 58fbfdd · 58fbfdd
1 parent 81f802f
commit 58fbfdd
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java
@@ -69,7 +69,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Cards cards = new CardsImpl();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java b/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java
@@ -88,7 +88,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Cards cards = new CardsImpl();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/c/CutADeal.java b/Mage.Sets/src/mage/cards/c/CutADeal.java
@@ -53,7 +53,7 @@ public CutADealEffect copy() {
     @Override
     public boolean apply(Game game, Ability source) {
         int count = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java b/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java
@@ -77,7 +77,7 @@ public JetsamEffect copy() {
     @Override
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
-        Set<Player> opponents = game.getOpponents(source.getControllerId())
+        Set<Player> opponents = game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java b/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java
@@ -80,7 +80,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Set<UUID> toDestroy = new HashSet();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/k/KroxaTitanOfDeathsHunger.java b/Mage.Sets/src/mage/cards/k/KroxaTitanOfDeathsHunger.java
@@ -109,7 +109,7 @@ public KroxaTitanOfDeathsHungerDiscardEffect copy() {
     @Override
     public boolean apply(Game game, Ability source) {
         Cards cards = new CardsImpl();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)
@@ -133,7 +133,7 @@ public boolean apply(Game game, Ability source) {
                     }
                     playerSet.add(player.getId());
                 });
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .filter(uuid -> !playerSet.contains(uuid))
                 .map(game::getPlayer)

diff --git a/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java b/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java
@@ -188,7 +188,7 @@ public boolean apply(Game game, Ability source) {
                 StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game
         );
         List<Player> opponentList = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/m/MezzioMugger.java b/Mage.Sets/src/mage/cards/m/MezzioMugger.java
@@ -72,7 +72,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Set<Card> cards = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java
@@ -76,7 +76,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Cards cards = new CardsImpl();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/s/SzatsWill.java b/Mage.Sets/src/mage/cards/s/SzatsWill.java
@@ -89,7 +89,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Cards cards = new CardsImpl(game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/t/TeachingsOfTheArchaics.java b/Mage.Sets/src/mage/cards/t/TeachingsOfTheArchaics.java
@@ -62,7 +62,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         int diff = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java b/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java
@@ -281,7 +281,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Cards cards = new CardsImpl();
-        game.getOpponents(source.getControllerId())
+        game.getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage.Sets/src/mage/cards/v/VoiceOfMany.java b/Mage.Sets/src/mage/cards/v/VoiceOfMany.java
@@ -64,7 +64,7 @@ public boolean apply(Game game, Ability source) {
                 StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game
         ).size();
         int toDraw = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .mapToInt(uuid -> game.getBattlefield().getAllActivePermanents(
                         StaticFilters.FILTER_PERMANENT_CREATURE, uuid, game

diff --git a/Mage.Sets/src/mage/cards/x/XandersPact.java b/Mage.Sets/src/mage/cards/x/XandersPact.java
@@ -75,7 +75,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Set<Card> cards = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsYouGainLifeLostEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LoseLifeOpponentsYouGainLifeLostEffect.java
@@ -43,7 +43,7 @@ public boolean apply(Game game, Ability source) {
             return true;
         }
         int totalLifeLost = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)

diff --git a/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java b/Mage/src/main/java/mage/game/permanent/token/AshiokNightmareMuseToken.java
@@ -66,7 +66,7 @@ public boolean apply(Game game, Ability source) {
             return false;
         }
         Set<Card> cards = game
-                .getOpponents(source.getControllerId())
+                .getOpponents(source.getControllerId(), true)
                 .stream()
                 .map(game::getPlayer)
                 .filter(Objects::nonNull)