From bb99148b78f579d2b3a42f7bed3012536b827000 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 7 Nov 2015 10:16:11 +0100
Subject: [PATCH] * Fixed a problem with zone change counter comparation.

---
 .../abilities/common/DiesAttachedTriggeredAbility.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
index 11d4a2764f3..d623e85a579 100644
--- a/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
+++ b/Mage/src/mage/abilities/common/DiesAttachedTriggeredAbility.java
@@ -70,9 +70,12 @@ public class DiesAttachedTriggeredAbility extends TriggeredAbilityImpl {
                 Permanent attachment = game.getPermanentOrLKIBattlefield(getSourceId());
                 if (attachment != null
                         && zEvent.getTargetId() != null && attachment.getAttachedTo() != null
-                        && zEvent.getTargetId().equals(attachment.getAttachedTo())
-                        && attachment.getAttachedToZoneChangeCounter() == zEvent.getTarget().getZoneChangeCounter(game) - 1) {
-                    triggered = true;
+                        && zEvent.getTargetId().equals(attachment.getAttachedTo())) {
+                    Permanent attachedTo = game.getPermanentOrLKIBattlefield(attachment.getAttachedTo());
+                    if (attachedTo != null
+                            && attachment.getAttachedToZoneChangeCounter() == attachedTo.getZoneChangeCounter(game)) {  // zoneChangeCounter is stored in Permanent
+                        triggered = true;
+                    }
                 }
             }
             if (triggered) {