From 399cad18365f67bc1a23a4fe648073d8a838d5fd Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Fri, 7 Sep 2012 20:49:07 +0400
Subject: [PATCH] Fixed Issue#59: Reassembling Skeleton's log message
 incomplete

---
 .../mage/abilities/ActivatedAbilityImpl.java  | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Mage/src/mage/abilities/ActivatedAbilityImpl.java b/Mage/src/mage/abilities/ActivatedAbilityImpl.java
index 9bb9a4be1cf..3cebf984e62 100644
--- a/Mage/src/mage/abilities/ActivatedAbilityImpl.java
+++ b/Mage/src/mage/abilities/ActivatedAbilityImpl.java
@@ -28,7 +28,6 @@
 
 package mage.abilities;
 
-import java.util.UUID;
 import mage.Constants.AbilityType;
 import mage.Constants.TimingRule;
 import mage.Constants.Zone;
@@ -41,8 +40,11 @@ import mage.abilities.effects.Effect;
 import mage.abilities.effects.Effects;
 import mage.cards.Card;
 import mage.game.Game;
+import mage.game.stack.StackAbility;
 import mage.target.Target;
 
+import java.util.UUID;
+
 /**
  *
  * @author BetaSteward_at_googlemail.com
@@ -177,10 +179,20 @@ public abstract class ActivatedAbilityImpl<T extends ActivatedAbilityImpl<T>> ex
     protected String getMessageText(Game game) {
         StringBuilder sb = new StringBuilder();
         MageObject object = game.getObject(this.sourceId);
-        if (object != null)
-            sb.append(object.getName());
-        else
+        if (object != null) {
+            if (object instanceof StackAbility) {
+                Card card = game.getCard(((StackAbility) object).getSourceId());
+                if (card != null) {
+                    sb.append(card.getName());
+                } else {
+                    sb.append(object.getName());
+                }
+            } else {
+                sb.append(object.getName());
+            }
+        } else {
             sb.append("unknown");
+        }
         if (getTargets().size() > 0) {
             sb.append(" targeting ");
             for (Target target: getTargets()) {