From 217eaa55d727f59e332c705f091acc6f2701a37d Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 15 Sep 2014 00:10:14 +0200
Subject: [PATCH] * Zurgo Helmsmasher - Fixed that it got wrongly a +1/+1
 counter also if a planeswalker was put into graveyard.

---
 .../common/DiesAndDealtDamageThisTurnTriggeredAbility.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
index d6b2d6be3d8..7c4121947f9 100644
--- a/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAndDealtDamageThisTurnTriggeredAbility.java
@@ -3,6 +3,7 @@ package mage.abilities.common;
 import mage.MageObject;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.effects.Effect;
+import mage.constants.CardType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -32,8 +33,9 @@ public class DiesAndDealtDamageThisTurnTriggeredAbility extends TriggeredAbility
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
         if (event.getType() == GameEvent.EventType.ZONE_CHANGE && ((ZoneChangeEvent)event).isDiesEvent()) {
-            MageObject object = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD);
-            if (object instanceof Permanent && ((Permanent)object).getDealtDamageByThisTurn().contains(this.sourceId)) {
+            ZoneChangeEvent zEvent = (ZoneChangeEvent) event;
+            if (zEvent.getTarget().getCardType().contains(CardType.CREATURE) &&
+                    zEvent.getTarget().getDealtDamageByThisTurn().contains(this.sourceId)) {
                 for (Effect effect : getEffects()) {
                     effect.setTargetPointer(new FixedTarget(event.getTargetId()));
                 }