From defc1a40b7656c3f1c6a3ebf4d19fdda8d154aa7 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Tue, 29 Mar 2022 18:43:49 -0400
Subject: [PATCH] [GTC] small rework of Luminate Primordial (#8798)

---
 .../src/mage/cards/l/LuminatePrimordial.java    | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/l/LuminatePrimordial.java b/Mage.Sets/src/mage/cards/l/LuminatePrimordial.java
index c46a57342e7..f0e2304b9cc 100644
--- a/Mage.Sets/src/mage/cards/l/LuminatePrimordial.java
+++ b/Mage.Sets/src/mage/cards/l/LuminatePrimordial.java
@@ -13,6 +13,7 @@ import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
+import mage.game.Controllable;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
@@ -98,19 +99,23 @@ class LuminatePrimordialEffect extends OneShotEffect {
         Set<Permanent> permanents = source
                 .getTargets()
                 .stream()
-                .map(Target::getFirstTarget)
+                .map(Target::getTargets)
+                .flatMap(Collection::stream)
                 .map(game::getPermanent)
                 .filter(Objects::nonNull)
                 .collect(Collectors.toSet());
-        Map<UUID, Integer> map = new HashMap<>();
-        permanents.stream().map(p -> map.put(p.getControllerId(), p.getPower().getValue()));
+        Map<UUID, Integer> map = permanents
+                .stream()
+                .collect(Collectors.toMap(
+                        Controllable::getControllerId,
+                        permanent -> permanent.getPower().getValue()
+                ));
         controller.moveCards(permanents, Zone.EXILED, source, game);
         for (Map.Entry<UUID, Integer> entry : map.entrySet()) {
             Player player = game.getPlayer(entry.getKey());
-            if (player == null || entry.getValue() < 1) {
-                continue;
+            if (player != null && entry.getValue() > 0) {
+                player.gainLife(entry.getValue(), game, source);
             }
-            player.gainLife(entry.getValue(), game, source);
         }
         return true;
     }