From bc7ffd120145a0eb6f1c8c129b68ef7895179574 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Fri, 15 Mar 2013 15:57:06 +0100
Subject: [PATCH] Fixed a bug that the effect failed when the source attachment
 of the effect left meanwhile the battlefield.

---
 .../counter/AddPlusOneCountersAttachedEffect.java      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java b/Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java
index 47c1f37687b..06fcade4443 100644
--- a/Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java
+++ b/Mage/src/mage/abilities/effects/common/counter/AddPlusOneCountersAttachedEffect.java
@@ -29,6 +29,7 @@
 package mage.abilities.effects.common.counter;
 
 import mage.Constants.Outcome;
+import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
 import mage.counters.common.PlusOneCounter;
@@ -62,6 +63,9 @@ public class AddPlusOneCountersAttachedEffect extends OneShotEffect<AddPlusOneCo
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent enchantment = game.getPermanent(source.getSourceId());
+        if (enchantment == null) {
+            enchantment = (Permanent) game.getLastKnownInformation(source.getSourceId(), Zone.BATTLEFIELD);
+        }
         if (enchantment != null && enchantment.getAttachedTo() != null) {
             Permanent creature = game.getPermanent(enchantment.getAttachedTo());
             if (creature != null) {
@@ -72,10 +76,12 @@ public class AddPlusOneCountersAttachedEffect extends OneShotEffect<AddPlusOneCo
     }
 
     private void setText() {
-        if (amount > 1)
+        if (amount > 1) {
             staticText = "put " + Integer.toString(amount) + " +1/+1 counters on enchanted creature";
-        else
+        }
+        else {
             staticText = "put a +1/+1 counter on enchanted creature";
+        }
     }
 
 }