From 2729dbeb0934433fa38dc0638f4eb333d645c387 Mon Sep 17 00:00:00 2001
From: jeffwadsworth <jeffwadsworth@magefree>
Date: Wed, 1 Aug 2012 09:55:10 -0500
Subject: [PATCH] - Refactored Greatbow Doyen.

---
 Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
index 2397035c04..d37633ff14 100644
--- a/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
+++ b/Mage.Sets/src/mage/sets/morningtide/GreatbowDoyen.java
@@ -107,9 +107,10 @@ class GreatbowDoyenTriggeredAbility extends TriggeredAbilityImpl<GreatbowDoyenTr
         if (event.getType() == GameEvent.EventType.DAMAGED_CREATURE) {
             Permanent creature = game.getPermanent(event.getSourceId());
             Permanent damagedCreature = game.getPermanent(event.getTargetId());
-            if (creature.getCardType().contains(CardType.CREATURE) && damagedCreature != null
+            if (creature != null && damagedCreature != null 
+                    && creature.getCardType().contains(CardType.CREATURE)
                     && creature.getSubtype().contains("Archer")
-                    && creature.getControllerId().equals(controllerId) && creature != null) {
+                    && creature.getControllerId().equals(controllerId)) {
                 this.getEffects().get(0).setValue("damageAmount", event.getAmount());
                 this.getEffects().get(0).setValue("controller", damagedCreature.getControllerId());
                 this.getEffects().get(0).setValue("source", event.getSourceId());