github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-17 09:16:26 -09:00
Code Issues Projects Releases Packages Wiki Activity

Fixed NPE in TopLibraryCardTypeCondition (fixes #300).

Browse source
This commit is contained in:
LevelX2 2013-07-25 19:05:58 +02:00
parent 655dcea56d
commit 90a41a10e7
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Mage/src/mage/abilities/condition/common/TopLibraryCardTypeCondition.java
View file

@ -31,6 +31,7 @@ import mage.constants.CardType;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.condition.Condition; import mage.abilities.condition.Condition;
import mage.game.Game; import mage.game.Game;
import mage.players.Player;
/** /**
* @author jeffwadsworth * @author jeffwadsworth
@ -50,20 +51,23 @@ public class TopLibraryCardTypeCondition implements Condition {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
boolean conditionApplies = false; boolean conditionApplies = false;
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && controller.getLibrary().size() > 0) {
switch (this.type) { switch (this.type) {
case CREATURE: case CREATURE:
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.CREATURE); conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.CREATURE);
break; break;
case LAND: case LAND:
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.LAND); conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.LAND);
break; break;
case SORCERY: case SORCERY:
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.SORCERY); conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.SORCERY);
break; break;
case INSTANT: case INSTANT:
conditionApplies |= game.getPlayer(source.getControllerId()).getLibrary().getFromTop(game).getCardType().contains(CardType.INSTANT); conditionApplies |= controller.getLibrary().getFromTop(game).getCardType().contains(CardType.INSTANT);
break; break;
} }
}
return conditionApplies; return conditionApplies;
} }
} }