From 59a4c0ec2aba32158348515a13c6aa6bc516bb2b Mon Sep 17 00:00:00 2001 From: Agetian Date: Sun, 18 Jan 2015 13:52:42 +0000 Subject: [PATCH] - Fixed NPE related to Devour. --- forge-game/src/main/java/forge/game/card/Card.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index a7d87f31f25..beda1d8d790 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4908,11 +4908,11 @@ public class Card extends GameEntity implements Comparable { return false; } } else if (property.equals("HasDevoured")) { - if (devouredCards.size() == 0) { + if (devouredCards == null || devouredCards.size() == 0) { return false; } } else if (property.equals("HasNotDevoured")) { - if (devouredCards.size() != 0) { + if (devouredCards != null && devouredCards.size() != 0) { return false; } } else if (property.equals("IsMonstrous")) {