github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 03:00:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed another NPE

Browse source
This commit is contained in:
BetaSteward 2011-09-12 21:19:18 -04:00
parent ad4b4e82c2
commit 2c8f9ce688
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/mage/players/PlayerImpl.java
View file

@ -393,12 +393,18 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
game.fireInformEvent(name + " discards " + Integer.toString(discardAmount) + " card" + (discardAmount > 1?"s":"")); game.fireInformEvent(name + " discards " + Integer.toString(discardAmount) + " card" + (discardAmount > 1?"s":""));
return; return;
} }
for (int i = 0; i < amount; i++) { int numDiscarded = 0;
while (numDiscarded < amount) {
if (hand.size() == 0)
break;
TargetDiscard target = new TargetDiscard(playerId); TargetDiscard target = new TargetDiscard(playerId);
choose(Outcome.Discard, target, game); choose(Outcome.Discard, target, game);
discard(hand.get(target.getFirstTarget(), game), source, game); Card card = hand.get(target.getFirstTarget(), game);
if (card != null && discard(card, source, game)) {
numDiscarded++;
}
} }
game.fireInformEvent(name + " discards " + Integer.toString(amount) + " card" + (amount > 1?"s":"")); game.fireInformEvent(name + " discards " + Integer.toString(numDiscarded) + " card" + (numDiscarded > 1?"s":""));
} }
@Override @Override
@ -583,7 +589,7 @@ public abstract class PlayerImpl<T extends PlayerImpl<T>> implements Player, Ser
//20091005 - 603.3c, 603.3d //20091005 - 603.3c, 603.3d
int bookmark = game.bookmarkState(); int bookmark = game.bookmarkState();
TriggeredAbility ability = (TriggeredAbility) source.copy(); TriggeredAbility ability = (TriggeredAbility) source.copy();
if (ability.canChooseTarget(game)) { if (ability != null && ability.canChooseTarget(game)) {
game.getStack().push(new StackAbility(ability, playerId)); game.getStack().push(new StackAbility(ability, playerId));
if (ability.activate(game, false)) { if (ability.activate(game, false)) {
game.removeBookmark(bookmark); game.removeBookmark(bookmark);