From bd70f923b7fd5b49f928ff01e7cda78c04de8da5 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 24 Jul 2016 17:13:53 +0200
Subject: [PATCH] * Permeating Mass - Fixed that the copy effect did only work,
 if Permeating Mass did not die from combat damge.

---
 .../mage/sets/eldritchmoon/PermeatingMass.java  |  4 ++--
 .../cards/single/emn/PermeatingMassTest.java    | 17 ++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java b/Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java
index 9990aa09b9c..61461fb5ee9 100644
--- a/Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java
+++ b/Mage.Sets/src/mage/sets/eldritchmoon/PermeatingMass.java
@@ -88,9 +88,9 @@ class PermeatingMassEffect extends OneShotEffect {
     public boolean apply(Game game, Ability ability) {
         Permanent copyTo = game.getPermanentOrLKIBattlefield(getTargetPointer().getFirst(game, ability));
         if (copyTo != null) {
-            Permanent copyFrom = game.getPermanent(ability.getSourceId());
+            Permanent copyFrom = (Permanent) ability.getSourceObject(game);
             if (copyFrom != null) {
-                game.copyPermanent(Duration.WhileOnBattlefield, copyFrom, copyTo.getId(), ability, new EmptyApplyToPermanent());
+                game.copyPermanent(Duration.Custom, copyFrom, copyTo.getId(), ability, new EmptyApplyToPermanent());
             }
         }
         return true;
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/PermeatingMassTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/PermeatingMassTest.java
index 159f2f5ec9c..e4622437723 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/PermeatingMassTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/emn/PermeatingMassTest.java
@@ -7,7 +7,6 @@ package org.mage.test.cards.single.emn;
 
 import mage.constants.PhaseStep;
 import mage.constants.Zone;
-import mage.game.permanent.Permanent;
 import org.junit.Test;
 import org.mage.test.serverside.base.CardTestPlayerBase;
 
@@ -16,24 +15,24 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  * @author escplan9 (Derek Monturo - dmontur1 at gmail dot com)
  */
 public class PermeatingMassTest extends CardTestPlayerBase {
-   
+
     @Test
     public void testWhenDiesInCombatMakesCopyStill() {
-                
+
         addCard(Zone.BATTLEFIELD, playerA, "Hill Giant"); // 3/3
-        
+
         // Whenever Permeating Mass deals combat damage to a creature, that creature becomes a copy of Permeating Mass.
         addCard(Zone.BATTLEFIELD, playerB, "Permeating Mass"); // 1/3
-        
+
         attack(1, playerA, "Hill Giant");
         block(1, playerB, "Permeating Mass", "Hill Giant");
-        
+
         setStopAt(1, PhaseStep.END_COMBAT);
         execute();
-        
+
         assertLife(playerB, 20);
         assertGraveyardCount(playerB, "Permeating Mass", 1);
-        Permanent hilly = getPermanent("Hill Giant", playerA);
-        assertPowerToughness(playerA, "Hill Giant", 1, 3);
+        assertPermanentCount(playerA, "Permeating Mass", 1);
+        assertPowerToughness(playerA, "Permeating Mass", 1, 3);
     }
 }