mirror of
https://github.com/correl/mage.git
synced 2024-12-26 11:09:27 +00:00
Fixed NPE in TopLibraryCardTypeCondition (fixes #300).
This commit is contained in:
parent
655dcea56d
commit
90a41a10e7
1 changed files with 17 additions and 13 deletions
|
@ -31,6 +31,7 @@ import mage.constants.CardType;
|
|||
import mage.abilities.Ability;
|
||||
import mage.abilities.condition.Condition;
|
||||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
|
||||
/**
|
||||
* @author jeffwadsworth
|
||||
|
@ -50,20 +51,23 @@ public class TopLibraryCardTypeCondition implements Condition {
|
|||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
boolean conditionApplies = false;
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
if (controller != null && controller.getLibrary().size() > 0) {
|
||||
switch (this.type) {
|
||||
case CREATURE:
|
||||
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.CREATURE);
|
||||
conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.CREATURE);
|
||||
break;
|
||||
case LAND:
|
||||
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.LAND);
|
||||
conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.LAND);
|
||||
break;
|
||||
case SORCERY:
|
||||
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.SORCERY);
|
||||
conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.SORCERY);
|
||||
break;
|
||||
case INSTANT:
|
||||
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.INSTANT);
|
||||
conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.INSTANT);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return conditionApplies;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue