Fixed issue 171.

Also, removed some unused imports.
This commit is contained in:
North 2011-06-26 16:40:46 +03:00
parent 4344566cda
commit 67c1fc8ffa
5 changed files with 2 additions and 8 deletions

View file

@ -36,15 +36,11 @@ import mage.Constants.Rarity;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.EntersBattlefieldEffect;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.sets.magic2011.ThunderStrike;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**

View file

@ -30,9 +30,7 @@ package mage.sets.ravnika;
import java.util.UUID; import java.util.UUID;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity; import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.PayLifeCost;
import mage.abilities.effects.common.TapSourceUnlessPaysEffect; import mage.abilities.effects.common.TapSourceUnlessPaysEffect;

View file

@ -34,7 +34,7 @@ public class PermanentsOnBattlefieldCount implements DynamicValue {
@Override @Override
public int calculate(Game game, Ability sourceAbility) { public int calculate(Game game, Ability sourceAbility) {
return amount * game.getBattlefield().countAll(filter); return amount * game.getBattlefield().count(filter, sourceAbility.getControllerId(), game);
} }
@Override @Override

View file

@ -34,7 +34,6 @@ import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.game.stack.Spell; import mage.game.stack.Spell;
import mage.game.stack.StackObject;
/** /**
* *

View file

@ -1120,6 +1120,7 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
} }
@Override
public void setGameOptions(GameOptions options) { public void setGameOptions(GameOptions options) {
this.gameOptions = options; this.gameOptions = options;
} }