From 87b40007a860724ebc1e8949225bc2baee2d0946 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 7 May 2020 18:19:46 -0400 Subject: [PATCH] fixed Rielle, the Everwise not triggering properly (fixes #6530) --- Mage.Sets/src/mage/cards/r/RielleTheEverwise.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Mage.Sets/src/mage/cards/r/RielleTheEverwise.java b/Mage.Sets/src/mage/cards/r/RielleTheEverwise.java index 17b4eb219e4..58c90e1f7c4 100644 --- a/Mage.Sets/src/mage/cards/r/RielleTheEverwise.java +++ b/Mage.Sets/src/mage/cards/r/RielleTheEverwise.java @@ -99,7 +99,7 @@ class RielleTheEverwiseTriggeredAbility extends TriggeredAbilityImpl { class RielleTheEverwiseWatcher extends Watcher { - private final Map discardedThisTurn = new HashMap(); + private final Map discardedThisTurn = new HashMap<>(); RielleTheEverwiseWatcher() { super(WatcherScope.GAME); @@ -107,8 +107,9 @@ class RielleTheEverwiseWatcher extends Watcher { @Override public void watch(GameEvent event, Game game) { - if (event.getAmount() > 0) { - discardedThisTurn.compute(event.getPlayerId(), (u, i) -> i == null ? 1 : i + 1); + if (event.getType() == GameEvent.EventType.DISCARDED_CARDS + && event.getAmount() > 0) { + discardedThisTurn.merge(event.getPlayerId(), 1, Integer::sum); } }