From 67ca1d3004bb6feb2495ec6ac1d3cdc99d2036cf Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 12:58:03 +0000
Subject: [PATCH] - "Whenever a creature dealt damage by CARDNAME this turn is
 put into a graveyard, put a +1/+1 counter on CARDNAME." now triggers on
 non-combat damage also. - Added Blood Cultist.

---
 .gitattributes                    |  1 +
 res/cardsfolder/blood_cultist.txt | 10 ++++++++++
 src/forge/Card.java               |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 res/cardsfolder/blood_cultist.txt

diff --git a/.gitattributes b/.gitattributes
index 5f8b5c79288..816ddecaf5f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -523,6 +523,7 @@ res/cardsfolder/blizzard_elemental.txt -text svneol=native#text/plain
 res/cardsfolder/bloated_toad.txt -text svneol=native#text/plain
 res/cardsfolder/blockade_runner.txt -text svneol=native#text/plain
 res/cardsfolder/blood_crypt.txt -text svneol=native#text/plain
+res/cardsfolder/blood_cultist.txt -text svneol=native#text/plain
 res/cardsfolder/blood_knight.txt -text svneol=native#text/plain
 res/cardsfolder/blood_pet.txt -text svneol=native#text/plain
 res/cardsfolder/blood_rites.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/blood_cultist.txt b/res/cardsfolder/blood_cultist.txt
new file mode 100644
index 00000000000..57a2865c0a9
--- /dev/null
+++ b/res/cardsfolder/blood_cultist.txt
@@ -0,0 +1,10 @@
+Name:Blood Cultist
+ManaCost:1 B R
+Types:Creature Human Wizard
+Text:no text
+PT:1/1
+A:AB$DealDamage | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature.
+K:Whenever a creature dealt damage by CARDNAME this turn is put into a graveyard, put a +1/+1 counter on CARDNAME.
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/blood_cultist.jpg
+End
diff --git a/src/forge/Card.java b/src/forge/Card.java
index 886fa0d5d52..a27f6ea794e 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -2671,7 +2671,6 @@ public class Card extends MyObservable {
         if(damage < 0) damage = 0;
         
         int assignedDamage = damage;
-        addReceivedDamageFromThisTurn(sourceCard, damage);
         
         if(!CardFactoryUtil.canDamage(sourceCard, this)) assignedDamage = 0;
 
@@ -2839,6 +2838,8 @@ public class Card extends MyObservable {
         System.out.println("Adding " + damageToAdd + " damage to " + getName());
         Log.debug("Adding " + damageToAdd + " damage to " + getName());
         
+        addReceivedDamageFromThisTurn(source, damageToAdd);
+        
         GameActionUtil.executeDamageDealingEffects(source, damageToAdd);
         
         if(this.isPlaneswalker()) {