From b46adaeb9e1a7c2d7e24fc15c78d8ea2a5f47ee0 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Tue, 5 Mar 2013 14:42:49 +0000
Subject: [PATCH] - Added Descriptions and ActivatingPlayers to some Upkeep
 abilities.

---
 src/main/java/forge/game/phase/Upkeep.java | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/forge/game/phase/Upkeep.java b/src/main/java/forge/game/phase/Upkeep.java
index 451c7113917..7dc959f3192 100644
--- a/src/main/java/forge/game/phase/Upkeep.java
+++ b/src/main/java/forge/game/phase/Upkeep.java
@@ -148,7 +148,9 @@ public class Upkeep extends Phase {
 
                 }
             };
+            upkeepAbility.setActivatingPlayer(c.getController());
             upkeepAbility.setStackDescription(sb.toString());
+            upkeepAbility.setDescription(sb.toString());
 
             game.getStack().addSimultaneousStackEntry(upkeepAbility);
 
@@ -206,6 +208,7 @@ public class Upkeep extends Phase {
                         }
                     }
                 };
+                sacAbility.setActivatingPlayer(c.getController());
                 sacAbility.setStackDescription(sb.toString());
                 sacAbility.setDescription(sb.toString());
 
@@ -514,7 +517,9 @@ public class Upkeep extends Phase {
 
             final StringBuilder sb = new StringBuilder();
             sb.append(abyss.getName()).append(" - destroy a nonartifact creature of your choice.");
+            sacrificeCreature.setActivatingPlayer(c.getController());
             sacrificeCreature.setStackDescription(sb.toString());
+            sacrificeCreature.setDescription(sb.toString());
             game.getStack().addAndUnfreeze(sacrificeCreature);
         } // end for
     } // The Abyss
@@ -587,7 +592,9 @@ public class Upkeep extends Phase {
 
             final StringBuilder sb = new StringBuilder();
             sb.append(c.getName()).append(" - destroy 1 creature with lowest power.");
+            ability.setActivatingPlayer(c.getController());
             ability.setStackDescription(sb.toString());
+            ability.setDescription(sb.toString());
 
             game.getStack().addSimultaneousStackEntry(ability);
 
@@ -997,6 +1004,7 @@ public class Upkeep extends Phase {
             sb.append(source).append(" - deals ").append(damage).append(" damage to ").append(player);
             ability.setStackDescription(sb.toString());
             ability.setDescription(sb.toString());
+            ability.setActivatingPlayer(surge.getController());
 
             if (damage > 0) {
                 game.getStack().addSimultaneousStackEntry(ability);
@@ -1084,6 +1092,7 @@ public class Upkeep extends Phase {
                     + " taps X artifacts, creatures or lands he or she controls.");
             ability.setDescription(source.getName() + " - " + player
                     + " taps X artifacts, creatures or lands he or she controls.");
+            ability.setActivatingPlayer(source.getController());
 
             game.getStack().addSimultaneousStackEntry(ability);
 
@@ -1119,6 +1128,8 @@ public class Upkeep extends Phase {
             sb.append(blaze.get(i)).append(" - has a blaze counter and deals 1 damage to ");
             sb.append(player).append(".");
             ability.setStackDescription(sb.toString());
+            ability.setDescription(sb.toString());
+            ability.setActivatingPlayer(source.getController());
 
             game.getStack().addSimultaneousStackEntry(ability);