github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/magefree/mage.git

Browse source
This commit is contained in:
jeffwadsworth 2012-07-01 17:30:21 -05:00
commit 8cd16e21b3
3 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Mage.Sets/src/mage/sets/fifthedition/Justice.java
View file

@ -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);

15
Mage.Tests/src/test/java/org/mage/test/cards/continuous/GoblinBushwhackerTest.java
View file

@ -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
*/

4
Mage/src/mage/game/GameState.java
View file

@ -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) {