From 742b7c01801aa36816dced4a6cfc6b2c7e2901a8 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 2 Jul 2012 00:29:49 +0400
Subject: [PATCH 1/3] Fixed bug when 2\2 creature was 6\2 on first turn

---
 Mage/src/mage/game/GameState.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Mage/src/mage/game/GameState.java b/Mage/src/mage/game/GameState.java
index 2e434915301..28d7bb979ac 100644
--- a/Mage/src/mage/game/GameState.java
+++ b/Mage/src/mage/game/GameState.java
@@ -33,6 +33,7 @@ import mage.abilities.*;
 import mage.abilities.effects.ContinuousEffect;
 import mage.abilities.effects.ContinuousEffects;
 import mage.abilities.effects.Effect;
+import mage.abilities.keyword.KickerAbility;
 import mage.cards.Card;
 import mage.choices.Choice;
 import mage.game.combat.Combat;
@@ -440,6 +441,9 @@ public class GameState implements Serializable, Copyable<GameState> {
 
     public void addAbility(Ability ability) {
         if (ability instanceof StaticAbility) {
+            if (ability instanceof KickerAbility) {
+                return;
+            }
             for (Mode mode: ability.getModes().values()) {
                 for (Effect effect: mode.getEffects()) {
                     if (effect instanceof ContinuousEffect) {

From 93201b53f7680b2bf6a65c4877cc22cb7f25a3b4 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 2 Jul 2012 00:35:01 +0400
Subject: [PATCH 2/3] updated test

---
 .../cards/continuous/GoblinBushwhackerTest.java   | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
index aed73a998d1..63ef964b469 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
@@ -9,6 +9,21 @@ import org.mage.test.serverside.base.CardTestPlayerBase;
  */
 public class GoblinBushwhackerTest extends CardTestPlayerBase {
 
+    @Test
+    public void testKicker() {
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Mountain", 2);
+        addCard(Constants.Zone.HAND, playerA, "Goblin Bushwhacker");
+        addCard(Constants.Zone.BATTLEFIELD, playerA, "Elite Vanguard");
+
+        castSpell(1, Constants.PhaseStep.PRECOMBAT_MAIN, playerA, "Goblin Bushwhacker");
+
+        setStopAt(1, Constants.PhaseStep.BEGIN_COMBAT);
+        execute();
+
+        assertPermanentCount(playerA, "Elite Vanguard", 1);
+        assertPowerToughness(playerA, "Elite Vanguard", 3, 1);
+    }
+    
     /**
      * Tests doesn't work in library and in hand
      */

From bae143241138859c49148776b42ff0ae056179f8 Mon Sep 17 00:00:00 2001
From: magenoxx <magenoxx@gmail>
Date: Mon, 2 Jul 2012 00:50:16 +0400
Subject: [PATCH 3/3] Changed collector id for image

---
 Mage.Sets/src/mage/sets/fifthedition/Justice.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/fifthedition/Justice.java b/Mage.Sets/src/mage/sets/fifthedition/Justice.java
index 894c371cce1..f2a8a144f9f 100644
--- a/Mage.Sets/src/mage/sets/fifthedition/Justice.java
+++ b/Mage.Sets/src/mage/sets/fifthedition/Justice.java
@@ -27,7 +27,6 @@
  */
 package mage.sets.fifthedition;
 
-import java.util.UUID;
 import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
@@ -48,6 +47,8 @@ import mage.game.stack.Spell;
 import mage.players.Player;
 import mage.target.targetpointer.FixedTarget;
 
+import java.util.UUID;
+
 /**
  *
  * @author jeffwadsworth
@@ -55,7 +56,7 @@ import mage.target.targetpointer.FixedTarget;
 public class Justice extends CardImpl<Justice> {
 
     public Justice(UUID ownerId) {
-        super(ownerId, 6, "Justice", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}");
+        super(ownerId, 317, "Justice", Rarity.UNCOMMON, new CardType[]{CardType.ENCHANTMENT}, "{2}{W}{W}");
         this.expansionSetCode = "5ED";
 
         this.color.setWhite(true);