From 1cfdb0aa0c3f740f0aa22bdd091a239ee8edae9d Mon Sep 17 00:00:00 2001
From: swordshine <swordshine@cardforge.org>
Date: Tue, 16 Aug 2016 12:20:00 +0000
Subject: [PATCH] - CN2: Added Kaya, Ghost Assassin and Capital Punishment

---
 .../forge/game/ability/effects/VoteEffect.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java b/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java
index 1405bb2be13..5ea44eb6f5b 100644
--- a/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java
+++ b/forge-game/src/main/java/forge/game/ability/effects/VoteEffect.java
@@ -97,12 +97,17 @@ public class VoteEffect extends SpellAbilityEffect {
                 subAbs.add(sa.getParam("Vote" + type.toString()));
             }
         }
-        
-        for (final String subAb : subAbs) {
-            final SpellAbility action = AbilityFactory.getAbility(host.getSVar(subAb), host);
-            action.setActivatingPlayer(sa.getActivatingPlayer());
-            ((AbilitySub) action).setParent(sa);
-            AbilityUtils.resolve(action);
+        if (sa.hasParam("StoreVoteNum")) {
+            for (final Object type : voteType) {
+                host.setSVar("VoteNum" + type, "Number$" + votes.get(type).size());
+            }
+        } else {
+            for (final String subAb : subAbs) {
+                final SpellAbility action = AbilityFactory.getAbility(host.getSVar(subAb), host);
+                action.setActivatingPlayer(sa.getActivatingPlayer());
+                ((AbilitySub) action).setParent(sa);
+                AbilityUtils.resolve(action);
+            }
         }
         if (sa.hasParam("VoteSubAbility")) {
             host.clearRemembered();
@@ -124,4 +129,5 @@ public class VoteEffect extends SpellAbilityEffect {
         }
         return most;
     }
+
 }