From 73d87a9432a447f8d12f1106faba2d1ab4afa3c1 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Sun, 12 Jan 2020 14:08:31 -0500
Subject: [PATCH] fixed Polukranos, Unchained not getting counters when
 entering from a zone other than the stack

---
 .../src/mage/cards/p/PolukranosUnchained.java      | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java
index 32652cdf22..1e83a364f8 100644
--- a/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java
+++ b/Mage.Sets/src/mage/cards/p/PolukranosUnchained.java
@@ -1,8 +1,5 @@
 package mage.cards.p;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.SpellAbility;
@@ -26,6 +23,10 @@ import mage.game.Game;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPermanent;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 /**
  * @author TheElk801
  */
@@ -92,11 +93,12 @@ class PolukranosUnchainedEffect extends OneShotEffect {
             return false;
         }
         SpellAbility spellAbility = (SpellAbility) getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY);
-        int counters = (spellAbility instanceof EscapeAbility) ? 12 : 6;
-        if (!spellAbility.getSourceId().equals(source.getSourceId())
+        int counters = 12;
+        if (!(spellAbility instanceof EscapeAbility)
+                || !spellAbility.getSourceId().equals(source.getSourceId())
                 || permanent.getZoneChangeCounter(game) != spellAbility.getSourceObjectZoneChangeCounter()
                 || !spellAbility.getSourceId().equals(source.getSourceId())) {
-            return false;
+            counters = 6;
         }
         List<UUID> appliedEffects = (ArrayList<UUID>) this.getValue("appliedEffects");
         permanent.addCounters(CounterType.P1P1.createInstance(counters), source, game, appliedEffects);