From 2603d14b7ec07ead3d15e0cdd9a2662ef05f4348 Mon Sep 17 00:00:00 2001
From: Hanmac <hanmac@gmx.de>
Date: Tue, 21 Aug 2018 17:43:17 +0200
Subject: [PATCH] GameActionUtil: EquipInstantSpeed should affect the player

---
 .../main/java/forge/game/GameActionUtil.java  | 24 +++++++++----------
 .../res/cardsfolder/l/leonin_shikari.txt      |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/GameActionUtil.java b/forge-game/src/main/java/forge/game/GameActionUtil.java
index 7216771ff41..0de9cf8d9dd 100644
--- a/forge-game/src/main/java/forge/game/GameActionUtil.java
+++ b/forge-game/src/main/java/forge/game/GameActionUtil.java
@@ -109,7 +109,7 @@ public final class GameActionUtil {
                 final SpellAbility newSA = sa.copy(activator);
                 final SpellAbilityRestriction sar = newSA.getRestrictions();
                 if (o.isWithFlash()) {
-                	sar.setInstantSpeed(true);
+                    sar.setInstantSpeed(true);
                 }
                 sar.setZone(null);
                 newSA.setMayPlay(o.getAbility());
@@ -186,6 +186,15 @@ public final class GameActionUtil {
             alternatives.add(newSA);
         }
 
+        if (sa.hasParam("Equip") && activator.hasKeyword("EquipInstantSpeed")) {
+            final SpellAbility newSA = sa.copy(activator);
+            SpellAbilityRestriction sar = newSA.getRestrictions();
+            sar.setSorcerySpeed(false);
+            sar.setInstantSpeed(true);
+            newSA.setDescription(sa.getDescription() + " (you may activate any time you could cast an instant )");
+            alternatives.add(newSA);
+        }
+
         for (final KeywordInterface inst : source.getKeywords()) {
             final String keyword = inst.getOriginal();
             if (sa.isSpell() && keyword.startsWith("Flashback")) {
@@ -207,15 +216,6 @@ public final class GameActionUtil {
                 }
                 alternatives.add(flashback);
             }
-
-            if (sa.hasParam("Equip") && sa instanceof AbilityActivated && keyword.equals("EquipInstantSpeed")) {
-                final SpellAbility newSA = sa.copy(activator);
-                SpellAbilityRestriction sar = newSA.getRestrictions();
-                sar.setSorcerySpeed(false);
-                sar.setInstantSpeed(true);
-                newSA.setDescription(sa.getDescription() + " (you may activate any time you could cast an instant )");
-                alternatives.add(newSA);
-            }
         }
         return alternatives;
     }
@@ -390,8 +390,8 @@ public final class GameActionUtil {
                     }
                 }
             } else if (keyword.startsWith("Kicker")) {
-            	String[] sCosts = TextUtil.split(keyword.substring(6), ':');
-            	boolean generic = "Generic".equals(sCosts[sCosts.length - 1]);
+                String[] sCosts = TextUtil.split(keyword.substring(6), ':');
+                boolean generic = "Generic".equals(sCosts[sCosts.length - 1]);
                 // If this is a "generic kicker" (Undergrowth), ignore value for kicker creations
                 int numKickers = sCosts.length - (generic ? 1 : 0);
                 for (int i = 0; i < abilities.size(); i++) {
diff --git a/forge-gui/res/cardsfolder/l/leonin_shikari.txt b/forge-gui/res/cardsfolder/l/leonin_shikari.txt
index f7fbf1a466d..cc1d4babd98 100644
--- a/forge-gui/res/cardsfolder/l/leonin_shikari.txt
+++ b/forge-gui/res/cardsfolder/l/leonin_shikari.txt
@@ -2,6 +2,6 @@ Name:Leonin Shikari
 ManaCost:1 W
 Types:Creature Cat Soldier
 PT:2/2
-S:Mode$ Continuous | AddHiddenKeyword$ EquipInstantSpeed | Affected$ Card.withEquip+YouCtrl | Description$ You may activate equip abilities any time you could cast an instant.
+S:Mode$ Continuous | Affected$ You | AddKeyword$ EquipInstantSpeed | Description$ You may activate equip abilities any time you could cast an instant.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/leonin_shikari.jpg
 Oracle:You may activate equip abilities any time you could cast an instant.