From 182f91ea4140dc07bb1a8e3b163c3d74cf0c7db4 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Thu, 7 May 2015 21:14:21 +0200
Subject: [PATCH] * Kuon, Ogre Ascendant - Fixed that also non creatures going
 to graveyard were count for Kuon, Ogre Ascendant flip ability.

---
 .../saviorsofkamigawa/KuonOgreAscendant.java  |  1 -
 .../watchers/common/CreaturesDiedWatcher.java | 21 +++++++++++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java
index 37b87fb708d..d926a5239af 100644
--- a/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java
+++ b/Mage.Sets/src/mage/sets/saviorsofkamigawa/KuonOgreAscendant.java
@@ -58,7 +58,6 @@ public class KuonOgreAscendant extends CardImpl {
         this.subtype.add("Ogre");
         this.subtype.add("Monk");
 
-        this.color.setBlack(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(4);
 
diff --git a/Mage/src/mage/watchers/common/CreaturesDiedWatcher.java b/Mage/src/mage/watchers/common/CreaturesDiedWatcher.java
index 98a83fb057d..edbabb05fff 100644
--- a/Mage/src/mage/watchers/common/CreaturesDiedWatcher.java
+++ b/Mage/src/mage/watchers/common/CreaturesDiedWatcher.java
@@ -27,6 +27,7 @@
  */
 package mage.watchers.common;
 
+import mage.constants.CardType;
 import mage.constants.WatcherScope;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -37,25 +38,27 @@ import mage.watchers.Watcher;
  *
  * @author LevelX2
  */
-
 public class CreaturesDiedWatcher extends Watcher {
 
     private int amountOfCreaturesThatDied;
 
     public CreaturesDiedWatcher() {
-       super("CreaturesDiedWatcher", WatcherScope.GAME);
+        super("CreaturesDiedWatcher", WatcherScope.GAME);
     }
 
     public CreaturesDiedWatcher(final CreaturesDiedWatcher watcher) {
-       super(watcher);
-       this.amountOfCreaturesThatDied = watcher.amountOfCreaturesThatDied;
+        super(watcher);
+        this.amountOfCreaturesThatDied = watcher.amountOfCreaturesThatDied;
     }
 
     @Override
     public void watch(GameEvent event, Game game) {
-       if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
-           amountOfCreaturesThatDied++;
-       }
+        if (event.getType() == GameEvent.EventType.ZONE_CHANGE) {
+            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+            if (zEvent.isDiesEvent() && zEvent.getTarget() != null && zEvent.getTarget().getCardType().contains(CardType.CREATURE)) {
+                amountOfCreaturesThatDied++;
+            }
+        }
     }
 
     @Override
@@ -64,12 +67,12 @@ public class CreaturesDiedWatcher extends Watcher {
     }
 
     public int getAmountOfCreaturesDiesThisTurn() {
-       return amountOfCreaturesThatDied;
+        return amountOfCreaturesThatDied;
     }
 
     @Override
     public CreaturesDiedWatcher copy() {
-       return new CreaturesDiedWatcher(this);
+        return new CreaturesDiedWatcher(this);
     }
 
 }