From 58fbfdd5298371333b4c4b4628c40f6ad8ec3c30 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Mon, 3 Feb 2025 17:46:57 +0400 Subject: [PATCH] refactor: improved usage of getOpponents to ignore leaved players in one short effects --- Mage.Sets/src/mage/cards/a/AuthorOfShadows.java | 2 +- Mage.Sets/src/mage/cards/b/BrainstealerDragon.java | 2 +- Mage.Sets/src/mage/cards/c/CutADeal.java | 2 +- Mage.Sets/src/mage/cards/f/FlotsamJetsam.java | 2 +- Mage.Sets/src/mage/cards/h/HighcliffFelidar.java | 2 +- Mage.Sets/src/mage/cards/k/KroxaTitanOfDeathsHunger.java | 4 ++-- Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java | 2 +- Mage.Sets/src/mage/cards/m/MezzioMugger.java | 2 +- Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java | 2 +- Mage.Sets/src/mage/cards/s/SzatsWill.java | 2 +- Mage.Sets/src/mage/cards/t/TeachingsOfTheArchaics.java | 2 +- Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java | 2 +- Mage.Sets/src/mage/cards/v/VoiceOfMany.java | 2 +- Mage.Sets/src/mage/cards/x/XandersPact.java | 2 +- .../common/LoseLifeOpponentsYouGainLifeLostEffect.java | 2 +- .../mage/game/permanent/token/AshiokNightmareMuseToken.java | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java index 230117ed331..a09352a5f75 100644 --- a/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java +++ b/Mage.Sets/src/mage/cards/a/AuthorOfShadows.java @@ -69,7 +69,7 @@ class AuthorOfShadowsEffect extends OneShotEffect { 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 index 2ac0edd6e2a..51191b395c7 100644 --- a/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java +++ b/Mage.Sets/src/mage/cards/b/BrainstealerDragon.java @@ -88,7 +88,7 @@ class BrainstealerDragonExileEffect extends OneShotEffect { 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 index 386083500bd..11473d97e10 100644 --- a/Mage.Sets/src/mage/cards/c/CutADeal.java +++ b/Mage.Sets/src/mage/cards/c/CutADeal.java @@ -53,7 +53,7 @@ class CutADealEffect extends OneShotEffect { @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 index e99e79682c3..f9ec20d4cd8 100644 --- a/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java +++ b/Mage.Sets/src/mage/cards/f/FlotsamJetsam.java @@ -77,7 +77,7 @@ class JetsamEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { Player controller = game.getPlayer(source.getControllerId()); - Set opponents = game.getOpponents(source.getControllerId()) + Set 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 index c49301426b1..1efe689abed 100644 --- a/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java +++ b/Mage.Sets/src/mage/cards/h/HighcliffFelidar.java @@ -80,7 +80,7 @@ class HighcliffFelidarEffect extends OneShotEffect { return false; } Set 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 index f6fe3c45f67..3cc9434f5fa 100644 --- a/Mage.Sets/src/mage/cards/k/KroxaTitanOfDeathsHunger.java +++ b/Mage.Sets/src/mage/cards/k/KroxaTitanOfDeathsHunger.java @@ -109,7 +109,7 @@ class KroxaTitanOfDeathsHungerDiscardEffect extends OneShotEffect { @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 @@ class KroxaTitanOfDeathsHungerDiscardEffect extends OneShotEffect { } 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 index 6c05efdee47..230b637b8e7 100644 --- a/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java +++ b/Mage.Sets/src/mage/cards/l/LukkaCoppercoatOutcast.java @@ -188,7 +188,7 @@ class LukkaCoppercoatOutcastDamageEffect extends OneShotEffect { StaticFilters.FILTER_PERMANENT_CREATURE, source.getControllerId(), game ); List 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 index aa7e207838c..b1fb0955dac 100644 --- a/Mage.Sets/src/mage/cards/m/MezzioMugger.java +++ b/Mage.Sets/src/mage/cards/m/MezzioMugger.java @@ -72,7 +72,7 @@ class MezzioMuggerEffect extends OneShotEffect { return false; } Set 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 index fee2d8def28..b8cb7485474 100644 --- a/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java +++ b/Mage.Sets/src/mage/cards/m/MnemonicBetrayal.java @@ -76,7 +76,7 @@ class MnemonicBetrayalExileEffect extends OneShotEffect { 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 index 2bd46e1b517..55aeae3f9e7 100644 --- a/Mage.Sets/src/mage/cards/s/SzatsWill.java +++ b/Mage.Sets/src/mage/cards/s/SzatsWill.java @@ -89,7 +89,7 @@ class SzatsWillEffect extends OneShotEffect { 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 index e87db4b3e5c..019f1eae79d 100644 --- a/Mage.Sets/src/mage/cards/t/TeachingsOfTheArchaics.java +++ b/Mage.Sets/src/mage/cards/t/TeachingsOfTheArchaics.java @@ -62,7 +62,7 @@ class TeachingsOfTheArchaicsEffect extends OneShotEffect { 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 index 47665872602..e12ddb9f71c 100644 --- a/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java +++ b/Mage.Sets/src/mage/cards/u/UvildaDeanOfPerfection.java @@ -281,7 +281,7 @@ class NassariDeanOfExpressionEffect extends OneShotEffect { 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 index 39be1262c85..a36bbb608e6 100644 --- a/Mage.Sets/src/mage/cards/v/VoiceOfMany.java +++ b/Mage.Sets/src/mage/cards/v/VoiceOfMany.java @@ -64,7 +64,7 @@ class VoiceOfManyEffect extends OneShotEffect { 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 index 93c0f3377d6..1733c8a8590 100644 --- a/Mage.Sets/src/mage/cards/x/XandersPact.java +++ b/Mage.Sets/src/mage/cards/x/XandersPact.java @@ -75,7 +75,7 @@ class XandersPactExileEffect extends OneShotEffect { return false; } Set 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 index e390384b404..aecb28a6765 100644 --- 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 class LoseLifeOpponentsYouGainLifeLostEffect extends OneShotEffect { 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 index 1be43c33bcc..707718dc4ca 100644 --- 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 @@ class AshiokNightmareMuseTokenEffect extends OneShotEffect { return false; } Set cards = game - .getOpponents(source.getControllerId()) + .getOpponents(source.getControllerId(), true) .stream() .map(game::getPlayer) .filter(Objects::nonNull)