Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Refactor: replaced sourceId by source and introduced source param in some methods;

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-12 20:23:19 +04:00
parent 2bb472607b
commit db239a1055
3205 changed files with 7080 additions and 6795 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/abilities/effects/common/DrawDiscardOneOfThemEffect.java
View file

@ -46,7 +46,7 @@ public class DrawDiscardOneOfThemEffect extends OneShotEffect {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Cards initialHand = controller.getHand().copy();
controller.drawCards(cardsToDraw, source.getSourceId(), game);
controller.drawCards(cardsToDraw, source, game);
Cards drawnCards = new CardsImpl(controller.getHand().copy());
drawnCards.removeAll(initialHand);
if (!drawnCards.isEmpty()) {
@ -55,7 +55,7 @@ public class DrawDiscardOneOfThemEffect extends OneShotEffect {
if (controller.choose(Outcome.Discard, drawnCards, cardToDiscard, game)) {
Card card = controller.getHand().get(cardToDiscard.getFirstTarget(), game);
if (card != null) {
return controller.discard(card, source, game);
return controller.discard(card, false, source, game);
}
}
}