Fixed NPE in some cards with exile zone (example: Draugr Necromancer)

This commit is contained in:
Oleg Agafonov 2023-03-31 23:38:09 +04:00
parent 3030feaaf1
commit d393ac9c60
3 changed files with 11 additions and 12 deletions

View file

@ -57,23 +57,20 @@ class TibaltCosmicImpostorPlayFromExileEffect extends AsThoughEffectImpl {
return false;
}
// the exile zone of the Tibalt, Cosmic Impostor that spawned the emblem only
UUID exileId = CardUtil.getExileZoneId(tibaltEmblem.getSourceObject().getId().toString(), game);
if (exileId == null) {
return false;
}
ExileZone exile = game.getState().getExile().getExileZone(exileId);
if (exile == null) {
return false;
}
if (exile.isEmpty()) {
UUID sourceId = tibaltEmblem.getSourceId();
UUID exileId = CardUtil.getExileZoneId(sourceId != null ? sourceId.toString() : source.getSourceId().toString(), game);
ExileZone exileZone = game.getState().getExile().getExileZone(exileId);
if (exileZone == null || exileZone.isEmpty()) {
return false;
}
Card cardInExile = game.getCard(objectId);
if (cardInExile == null) {
return false;
}
UUID mainCardId = cardInExile.getMainCard().getId();
if (exile.contains(mainCardId)
if (exileZone.contains(mainCardId)
&& affectedControllerId.equals(source.getControllerId())
&& game.getState().getZone(mainCardId).equals(Zone.EXILED)) {
CardUtil.makeCardPlayable(game, source, cardInExile, Duration.Custom, true);