From a51610589999560ba32dba7bbee9106ee30d2395 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Fri, 6 Oct 2023 01:10:36 -0400 Subject: [PATCH] followup fix for Disorder in the Court --- .../src/mage/cards/d/DisorderInTheCourt.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DisorderInTheCourt.java b/Mage.Sets/src/mage/cards/d/DisorderInTheCourt.java index 985054731fe..0b2b7b32bd8 100644 --- a/Mage.Sets/src/mage/cards/d/DisorderInTheCourt.java +++ b/Mage.Sets/src/mage/cards/d/DisorderInTheCourt.java @@ -86,15 +86,16 @@ class DisorderInTheCourtEffect extends OneShotEffect { .map(game::getPermanent) .filter(Objects::nonNull) .collect(Collectors.toCollection(LinkedHashSet::new)); - if (toExile.isEmpty()) { - return false; + if (!toExile.isEmpty()) { + controller.moveCardsToExile(toExile, source, game, true, CardUtil.getExileZoneId(game, source), CardUtil.getSourceName(game, source)); + game.getState().processAction(game); } - controller.moveCardsToExile(toExile, source, game, true, CardUtil.getExileZoneId(game, source), CardUtil.getSourceName(game, source)); - game.getState().processAction(game); new InvestigateEffect(ManacostVariableValue.REGULAR).apply(game, source); - Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true, true); - effect.setTargetPointer(new FixedTargets(new CardsImpl(toExile), game)); - game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect), source); + if (!toExile.isEmpty()) { + Effect effect = new ReturnToBattlefieldUnderOwnerControlTargetEffect(true, true); + effect.setTargetPointer(new FixedTargets(new CardsImpl(toExile), game)); + game.addDelayedTriggeredAbility(new AtTheBeginOfNextEndStepDelayedTriggeredAbility(effect), source); + } return true; }