external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a NPE in DiscardEffect.

Browse Source
This commit is contained in:
Agetian
2017-09-27 17:02:23 +00:00
parent 5c295e9080
commit b969f2eac6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/ability/effects/DiscardEffect.java
View File

@@ -293,11 +293,11 @@ public class DiscardEffect extends SpellAbilityEffect {
CardCollectionView toBeDiscarded = validCards.isEmpty() ? null : chooser.getController().chooseCardsToDiscardFrom(p, sa, validCards, min, max); CardCollectionView toBeDiscarded = validCards.isEmpty() ? null : chooser.getController().chooseCardsToDiscardFrom(p, sa, validCards, min, max);
if (toBeDiscarded.size() > 1) {
toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(p.getGame(), toBeDiscarded, ZoneType.Graveyard);
}
if (toBeDiscarded != null) { if (toBeDiscarded != null) {
if (toBeDiscarded.size() > 1) {
toBeDiscarded = GameActionUtil.orderCardsByTheirOwners(p.getGame(), toBeDiscarded, ZoneType.Graveyard);
}
if (mode.startsWith("Reveal") ) { if (mode.startsWith("Reveal") ) {
p.getController().reveal(toBeDiscarded, ZoneType.Hand, p, p.getController().reveal(toBeDiscarded, ZoneType.Hand, p,
chooser + " has chosen " + (toBeDiscarded.size() == 1 ? "this card" : "these cards") + " from "); chooser + " has chosen " + (toBeDiscarded.size() == 1 ? "this card" : "these cards") + " from ");