diff --git a/Mage.Sets/src/mage/cards/b/Breakthrough.java b/Mage.Sets/src/mage/cards/b/Breakthrough.java index d6fcdc241f2..15f6a890e9d 100644 --- a/Mage.Sets/src/mage/cards/b/Breakthrough.java +++ b/Mage.Sets/src/mage/cards/b/Breakthrough.java @@ -65,7 +65,7 @@ class BreakthroughEffect extends OneShotEffect { if (player != null) { int amountToKeep = source.getManaCostsToPay().getX(); if (amountToKeep == 0) { - player.discard(player.getHand().size(), source, game); + player.discard(player.getHand().size(), false, source, game); } else if (amountToKeep < player.getHand().size()) { TargetCardInHand target = new TargetCardInHand(amountToKeep, new FilterCard()); diff --git a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java index 54476bf662f..5d6beefa3ba 100644 --- a/Mage.Sets/src/mage/cards/d/DimirCutpurse.java +++ b/Mage.Sets/src/mage/cards/d/DimirCutpurse.java @@ -56,7 +56,7 @@ class DimirCutpurseEffect extends OneShotEffect { Player you = game.getPlayer(source.getControllerId()); Player damagedPlayer = game.getPlayer(targetPointer.getFirst(game, source)); if (damagedPlayer != null) { - damagedPlayer.discard(1, source, game); + damagedPlayer.discard(1, false,source, game); } if (you != null) { you.drawCards(1, game); diff --git a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java index 16df6e009e5..7e996c5a251 100644 --- a/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java +++ b/Mage.Sets/src/mage/cards/g/GruesomeDiscovery.java @@ -75,7 +75,7 @@ class GruesomeDiscoveryEffect extends OneShotEffect { targetPlayer.revealCards("Gruesome Discovery", targetPlayer.getHand(), game); if (targetPlayer.getHand().size() <= 2) { - targetPlayer.discard(2, source, game); + targetPlayer.discard(2, false, source, game); } TargetCard target = new TargetCard(2, Zone.HAND, new FilterCard()); diff --git a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java index a2a2a59ab9f..992bca57bcb 100644 --- a/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java +++ b/Mage.Sets/src/mage/cards/i/IzzetKeyrune.java @@ -72,7 +72,7 @@ public final class IzzetKeyrune extends CardImpl { Player player = game.getPlayer(source.getControllerId()); if (player != null && player.chooseUse(Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", source, game)) { if (player.drawCards(1, game) > 0) { - player.discard(1, source, game); + player.discard(1, false, source, game); } return true; } diff --git a/Mage.Sets/src/mage/cards/m/MurderOfCrows.java b/Mage.Sets/src/mage/cards/m/MurderOfCrows.java index e583917511d..8b02356dc6b 100644 --- a/Mage.Sets/src/mage/cards/m/MurderOfCrows.java +++ b/Mage.Sets/src/mage/cards/m/MurderOfCrows.java @@ -64,7 +64,7 @@ class MurderOfCrowsEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); if (player != null && player.chooseUse(Outcome.DrawCard, "Do you wish to draw a card? If you do, discard a card.", source, game)) { if (player.drawCards(1, game) > 0) { - player.discard(1, source, game); + player.discard(1, false, source, game); } return true; } diff --git a/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java b/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java index cd7a9499162..732322083b0 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java +++ b/Mage.Sets/src/mage/cards/w/WhisperingSpecter.java @@ -64,7 +64,7 @@ class WhisperingSpecterEffect extends OneShotEffect { if (player != null) { int value = player.getCounters().getCount(CounterType.POISON); if (value > 0) { - player.discard(value, source, game); + player.discard(value, false, source, game); return true; } } diff --git a/Mage.Sets/src/mage/cards/w/WrenchMind.java b/Mage.Sets/src/mage/cards/w/WrenchMind.java index 35c04023174..ae5dbe64aae 100644 --- a/Mage.Sets/src/mage/cards/w/WrenchMind.java +++ b/Mage.Sets/src/mage/cards/w/WrenchMind.java @@ -66,7 +66,7 @@ class WrenchMindEffect extends OneShotEffect { if (card != null) { targetPlayer.discard(card, source, game); if (!card.isArtifact() && !targetPlayer.getHand().isEmpty()) { - targetPlayer.discard(1, source, game); + targetPlayer.discard(1, false, source, game); } return true; } diff --git a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java index f31dd797f6c..ff97f6d1753 100644 --- a/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java +++ b/Mage.Tests/src/test/java/org/mage/test/player/TestPlayer.java @@ -2304,11 +2304,6 @@ public class TestPlayer implements Player { return computerPlayer.removeFromLibrary(card, game); } - @Override - public void discard(int amount, Ability source, Game game) { - computerPlayer.discard(amount, source, game); - } - @Override public Card discardOne(boolean random, Ability source, Game game) { return computerPlayer.discardOne(random, source, game); diff --git a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java index d745681ea4c..f1e750f2ac0 100644 --- a/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java +++ b/Mage.Tests/src/test/java/org/mage/test/stub/PlayerStub.java @@ -657,11 +657,6 @@ public class PlayerStub implements Player { return 1; } - @Override - public void discard(int amount, Ability source, Game game) { - - } - @Override public Card discardOne(boolean random, Ability source, Game game) { return null; diff --git a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java index 26fa8a8a177..5c134042e18 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/DrawDiscardTargetEffect.java @@ -50,7 +50,7 @@ public class DrawDiscardTargetEffect extends OneShotEffect { Player player = game.getPlayer(getTargetPointer().getFirst(game, source)); if (player != null) { player.drawCards(cardsToDraw, game); - player.discard(cardsToDiscard, source, game); + player.discard(cardsToDiscard, false, source, game); return true; } return false; diff --git a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java index 7f46c95b754..cb1b992fe5b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/discard/DiscardHandTargetEffect.java @@ -44,7 +44,7 @@ public class DiscardHandTargetEffect extends OneShotEffect { for (UUID playerId: getTargetPointer().getTargets(game, source)) { Player player = game.getPlayer(playerId); if (player != null) { - player.discard(player.getHand().size(), source, game); + player.discard(player.getHand().size(), false, source, game); } } return true; diff --git a/Mage/src/main/java/mage/players/Player.java b/Mage/src/main/java/mage/players/Player.java index 989f14df13d..253c3ebb423 100644 --- a/Mage/src/main/java/mage/players/Player.java +++ b/Mage/src/main/java/mage/players/Player.java @@ -408,9 +408,6 @@ public interface Player extends MageItem, Copyable { PlanarDieRoll rollPlanarDie(Game game, ArrayList appliedEffects, int numberChaosSides, int numberPlanarSides); - @Deprecated - void discard(int amount, Ability source, Game game); - Card discardOne(boolean random, Ability source, Game game); Cards discard(int amount, boolean random, Ability source, Game game); diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java index d641650af6e..c7a6b13cc06 100644 --- a/Mage/src/main/java/mage/players/PlayerImpl.java +++ b/Mage/src/main/java/mage/players/PlayerImpl.java @@ -693,7 +693,7 @@ public abstract class PlayerImpl implements Player, Serializable { + (this.maxHandSize == 1 ? " hand card" : " hand cards")); } - discard(hand.size() - this.maxHandSize, null, game); + discard(hand.size() - this.maxHandSize, false,null, game); } } @@ -731,16 +731,6 @@ public abstract class PlayerImpl implements Player, Serializable { return true; } - /** - * @param amount - * @param source - * @param game - */ - @Override - public void discard(int amount, Ability source, Game game) { - discard(amount, false, source, game); - } - @Override public Card discardOne(boolean random, Ability source, Game game) { Cards cards = discard(1, random, source, game);