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

Fixed some possible null pointer exceptions.

Browse source
This commit is contained in:
LevelX2 2016-10-03 22:07:10 +02:00
parent 01ca3689b3
commit e8ab8558d1
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/mage/view/PlayerView.java
View file

@ -125,7 +125,7 @@ public class PlayerView implements Serializable {
} catch (ConcurrentModificationException e) { } catch (ConcurrentModificationException e) {
// can happen as a player left battlefield while PlayerView is created // can happen as a player left battlefield while PlayerView is created
} }
this.topCard = player.isTopCardRevealed() && player.getLibrary().size() > 0 this.topCard = (player.isTopCardRevealed() && player.getLibrary().size() > 0)
? new CardView(player.getLibrary().getFromTop(game)) : null; ? new CardView(player.getLibrary().getFromTop(game)) : null;
if (player.getUserData() != null) { if (player.getUserData() != null) {
this.userData = player.getUserData(); this.userData = player.getUserData();

2
Mage/src/main/java/mage/abilities/effects/common/DynamicManaEffect.java
View file

@ -146,7 +146,7 @@ public class DynamicManaEffect extends BasicManaEffect {
} else { } else {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (controller != null) { if (controller != null) {
ChoiceColor choiceColor = new ChoiceColor(); ChoiceColor choiceColor = new ChoiceColor(true);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
if (!choiceColor.isChosen()) { if (!choiceColor.isChosen()) {
while (!controller.choose(Outcome.Benefit, choiceColor, game)) { while (!controller.choose(Outcome.Benefit, choiceColor, game)) {