From ddce8ecbec42a6be808262f9fa0374269541fc01 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Mon, 23 Mar 2015 13:26:11 +0000
Subject: [PATCH] - Added Dragon Hunter.

---
 .gitattributes                                            | 1 +
 .../src/main/java/forge/game/combat/CombatUtil.java       | 4 +++-
 forge-gui/res/cardsfolder/d/dragon_hunter.txt             | 8 ++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 forge-gui/res/cardsfolder/d/dragon_hunter.txt

diff --git a/.gitattributes b/.gitattributes
index 114f497e219..76f82066fcf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4702,6 +4702,7 @@ forge-gui/res/cardsfolder/d/dragon_fangs.txt -text
 forge-gui/res/cardsfolder/d/dragon_fodder.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/d/dragon_grip.txt -text
 forge-gui/res/cardsfolder/d/dragon_hatchling.txt -text
+forge-gui/res/cardsfolder/d/dragon_hunter.txt -text
 forge-gui/res/cardsfolder/d/dragon_mage.txt svneol=native#text/plain
 forge-gui/res/cardsfolder/d/dragon_mantle.txt -text
 forge-gui/res/cardsfolder/d/dragon_mask.txt -text
diff --git a/forge-game/src/main/java/forge/game/combat/CombatUtil.java b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
index 2820817a49a..981e17ce163 100644
--- a/forge-game/src/main/java/forge/game/combat/CombatUtil.java
+++ b/forge-game/src/main/java/forge/game/combat/CombatUtil.java
@@ -949,7 +949,9 @@ public class CombatUtil {
         }
 
         if (attacker.hasKeyword("Flying") && !blocker.hasKeyword("Flying") && !blocker.hasKeyword("Reach")) {
-            return false;
+        	if (!attacker.getType().hasCreatureType("Dragon") || !blocker.hasKeyword("CARDNAME can block Dragons as though it had reach.")) {
+        		return false;
+        	}
         }
 
         if (attacker.hasKeyword("Horsemanship") && !blocker.hasKeyword("Horsemanship")) {
diff --git a/forge-gui/res/cardsfolder/d/dragon_hunter.txt b/forge-gui/res/cardsfolder/d/dragon_hunter.txt
new file mode 100644
index 00000000000..2f07927c2db
--- /dev/null
+++ b/forge-gui/res/cardsfolder/d/dragon_hunter.txt
@@ -0,0 +1,8 @@
+Name:Dragon Hunter
+ManaCost:W
+Types:Creature Human Warrior
+PT:2/1
+K:Protection from Dragons
+K:CARDNAME can block Dragons as though it had reach.
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dragon_hunter.jpg
+Oracle:Protection from Dragons\nDragon Hunter can block Dragons as though it had reach.