From d1598fbd72e21f86846b22f57db30c96d94a0684 Mon Sep 17 00:00:00 2001 From: Sloth Date: Sun, 13 Apr 2014 14:29:10 +0000 Subject: [PATCH] - Fixed a possible NPE in getHiddenExtrinsicKeyword. --- forge-game/src/main/java/forge/game/card/Card.java | 6 ++++-- 1 file changed, 4 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 b885349de4f..65ecf7b1716 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4557,8 +4557,10 @@ public class Card extends GameEntity implements Comparable { while (true) { try { final ArrayList keywords = new ArrayList(); - for (int i = 0; i < this.hiddenExtrinsicKeyword.size(); i++) { - String keyword = this.hiddenExtrinsicKeyword.get(i); + for (String keyword : this.hiddenExtrinsicKeyword) { + if (keyword == null) { + continue; + } if (keyword.startsWith("HIDDEN")) { keyword = keyword.substring(7); }