From 68613672b128b9e705e38ffafdefb18c0a865fd3 Mon Sep 17 00:00:00 2001
From: smartinsempere <smartin.sempere@gmail.com>
Date: Sun, 31 Jan 2021 20:03:30 +0100
Subject: [PATCH] Fire discard cards event when discarding as a cost (#7436)

Fire discard cards event when discarding as a cost, fixes #7368
---
 .../other/RielleTheEverwiseTest.java          | 78 +++++++++++++++++++
 .../main/java/mage/players/PlayerImpl.java    |  2 +-
 2 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java
new file mode 100644
index 00000000000..638b3913f0c
--- /dev/null
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/other/RielleTheEverwiseTest.java
@@ -0,0 +1,78 @@
+
+package org.mage.test.cards.abilities.other;
+
+import mage.constants.PhaseStep;
+import mage.constants.Zone;
+import org.junit.Test;
+import org.mage.test.serverside.base.CardTestPlayerBase;
+
+/**
+ *
+ * @author smartinsempere
+ */
+public class RielleTheEverwiseTest extends CardTestPlayerBase {
+
+    @Test
+    public void testRielleTheEverwiseAbilityDiscarding() {
+
+        addCard(Zone.HAND, playerA, "Faithless Looting");
+        addCard(Zone.HAND, playerA, "Brainwash");
+        addCard(Zone.HAND, playerA, "Brainwash");
+        addCard(Zone.HAND, playerA, "Brainwash");
+        addCard(Zone.BATTLEFIELD, playerA, "Mountain", 1);
+        addCard(Zone.BATTLEFIELD, playerA, "Rielle, the Everwise");
+
+        castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Faithless Looting");
+        setChoice(playerA, "Brainwash"); // discard
+        setChoice(playerA, "Brainwash"); // discard
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.POSTCOMBAT_MAIN);
+        execute();
+        assertAllCommandsUsed();
+
+        assertHandCount(playerA, 5);
+
+    }
+
+    @Test
+    public void testRielleTheEverwiseAbilityCycling() {
+
+        addCard(Zone.HAND, playerA, "Unearth");
+        addCard(Zone.HAND, playerA, "Brainwash");
+        addCard(Zone.BATTLEFIELD, playerA, "Swamp", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Rielle, the Everwise");
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Cycling {2}");
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        assertAllCommandsUsed();
+
+        assertHandCount(playerA, 3);
+
+    }
+
+    @Test
+    public void testRielleTheEverwiseAbilityTransmute() {
+
+        addCard(Zone.HAND, playerA, "Tolaria West");
+        addCard(Zone.HAND, playerA, "Brainwash");
+        addCard(Zone.LIBRARY, playerA, "Memnite");
+        addCard(Zone.BATTLEFIELD, playerA, "Island", 5);
+        addCard(Zone.BATTLEFIELD, playerA, "Rielle, the Everwise");
+
+        activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Transmute {1}{U}{U}");
+        addTarget(playerA, "Memnite");
+
+        setStrictChooseMode(true);
+        setStopAt(1, PhaseStep.BEGIN_COMBAT);
+        execute();
+        assertAllCommandsUsed();
+
+        assertHandCount(playerA, 3);
+
+    }
+
+}
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 6599bd815ba..8449bebba9c 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -783,7 +783,7 @@ public abstract class PlayerImpl implements Player, Serializable {
 
     @Override
     public boolean discard(Card card, boolean payForCost, Ability source, Game game) {
-        return doDiscard(card, source, game, payForCost, false);
+        return doDiscard(card, source, game, payForCost, true);
     }
 
     private boolean doDiscard(Card card, Ability source, Game game, boolean payForCost, boolean fireFinalEvent) {