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

Checked objects possible to cause null pointer exceptions. Added some logging.

Browse source
This commit is contained in:
LevelX2 2015-10-31 11:55:20 +01:00
parent c1d6703e71
commit a5d7ca83d7
12 changed files with 94 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Mage/src/mage/game/GameCommanderImpl.java
View file

@ -129,7 +129,9 @@ public abstract class GameCommanderImpl extends GameImpl {
if (!mulliganedCards.containsKey(playerId)) {
mulliganedCards.put(playerId, new CardsImpl());
}
card.moveToExile(null, "", null, this);
player.getHand().remove(card);
getExile().add(card);
getState().setZone(card.getId(), Zone.EXILED);
card.setFaceDown(true, this);
mulliganedCards.get(playerId).add(card);
}
@ -168,7 +170,9 @@ public abstract class GameCommanderImpl extends GameImpl {
if (player != null && mulliganedCards.containsKey(playerId)) {
for (Card card : mulliganedCards.get(playerId).getCards(this)) {
if (card != null) {
card.moveToZone(Zone.LIBRARY, null, this, false);
getExile().removeCard(card, this);
player.getLibrary().putOnTop(card, this);
getState().setZone(card.getId(), Zone.LIBRARY);
card.setFaceDown(false, this);
}
}