From 286d08452e01da4fa1260de331c1d2d48caefa7d Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 30 Jul 2017 19:39:28 +0200
Subject: [PATCH] * Jeleva, Nephalia's Scourge - Fixed that the ETB triggered
 ability also exiled card if Jeleva was e.g. copied by a Clone card.

---
 .../mage/cards/j/JelevaNephaliasScourge.java  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
index eec959ce32f..3db1324d721 100644
--- a/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
+++ b/Mage.Sets/src/mage/cards/j/JelevaNephaliasScourge.java
@@ -110,9 +110,9 @@ class JelevaNephaliasScourgeEffect extends OneShotEffect {
     public boolean apply(Game game, Ability source) {
         Player controller = game.getPlayer(source.getControllerId());
         MageObject sourceObject = source.getSourceObject(game);
-        JelevaNephaliasWatcher watcher = (JelevaNephaliasWatcher) game.getState().getWatchers().get(JelevaNephaliasWatcher.class.getSimpleName(), source.getSourceId());
+        JelevaNephaliasWatcher watcher = (JelevaNephaliasWatcher) game.getState().getWatchers().get(JelevaNephaliasWatcher.class.getSimpleName());
         if (controller != null && sourceObject != null && watcher != null) {
-            int xValue = watcher.getManaSpentToCastLastTime(sourceObject.getZoneChangeCounter(game) - 1);
+            int xValue = watcher.getManaSpentToCastLastTime(sourceObject.getId(), sourceObject.getZoneChangeCounter(game) - 1);
             if (xValue > 0) {
                 for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
                     Player player = game.getPlayer(playerId);
@@ -167,10 +167,10 @@ class JelevaNephaliasCastEffect extends OneShotEffect {
 
 class JelevaNephaliasWatcher extends Watcher {
 
-    private final Map<Integer, Integer> manaSpendToCast = new HashMap<>(); // cast
+    private final Map<String, Integer> manaSpendToCast = new HashMap<>(); // cast
 
     public JelevaNephaliasWatcher() {
-        super(JelevaNephaliasWatcher.class.getSimpleName(), WatcherScope.CARD);
+        super(JelevaNephaliasWatcher.class.getSimpleName(), WatcherScope.GAME);
     }
 
     public JelevaNephaliasWatcher(final JelevaNephaliasWatcher watcher) {
@@ -184,22 +184,22 @@ class JelevaNephaliasWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.SPELL_CAST && event.getSourceId().equals(sourceId)) {
+        // Watcher saves all casts becaus of possible Clone cards that copy Jeleva
+        if (event.getType() == GameEvent.EventType.SPELL_CAST) {
             if (!game.getStack().isEmpty()) {
                 for (StackObject stackObject : game.getStack()) {
-                    if (stackObject instanceof Spell && ((Spell) stackObject).getSourceId().equals(sourceId)) {
-                        Card card = game.getCard(sourceId);
-                        if (!manaSpendToCast.containsValue(card.getZoneChangeCounter(game))) {
-                            manaSpendToCast.put(card.getZoneChangeCounter(game), ((Spell) stackObject).getSpellAbility().getManaCostsToPay().convertedManaCost());
-                        }
+                    if (stackObject instanceof Spell) {
+                        Spell spell = (Spell) stackObject;
+                        manaSpendToCast.putIfAbsent(spell.getSourceId().toString() + spell.getCard().getZoneChangeCounter(game),
+                                spell.getSpellAbility().getManaCostsToPay().convertedManaCost());
                     }
                 }
             }
         }
     }
 
-    public int getManaSpentToCastLastTime(int zoneChangeCounter) {
-        return manaSpendToCast.getOrDefault(zoneChangeCounter, 0);
+    public int getManaSpentToCastLastTime(UUID sourceId, int zoneChangeCounter) {
+        return manaSpendToCast.getOrDefault(sourceId.toString() + zoneChangeCounter, 0);
     }
 
     @Override