From b518ce2ed6287d4c43e83db05266931f1ce7807c Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 10 Feb 2012 18:16:09 +0000 Subject: [PATCH] - Added a NPE check to sharesCreatureTypeWith. --- src/main/java/forge/Card.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index f4ab659ac08..89227e7cb0b 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -7337,6 +7337,10 @@ public class Card extends GameEntity implements Comparable { */ public final boolean sharesCreatureTypeWith(final Card c1) { + if (c1 == null) { + return false; + } + for (final String type : this.getType()) { if (type.equals("AllCreatureTypes") && c1.hasACreatureType()) { return true;