github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-24 11:50:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug of CrypticCommand tapping all creatures instead only creatures of opponents.

Browse source
This commit is contained in:
LevelX2 2013-03-10 02:23:53 +01:00
parent 0565cd1289
commit 6f1ed24e95
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage.Sets/src/mage/sets/lorwyn/CrypticCommand.java
View file

@ -29,6 +29,7 @@ package mage.sets.lorwyn;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType; import mage.Constants.CardType;
import mage.Constants.Outcome; import mage.Constants.Outcome;
import mage.Constants.Rarity; import mage.Constants.Rarity;
@ -40,7 +41,7 @@ import mage.abilities.effects.common.DrawCardControllerEffect;
import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ReturnToHandTargetEffect;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -109,6 +110,11 @@ public class CrypticCommand extends CardImpl<CrypticCommand> {
class CrypticCommandEffect extends OneShotEffect<CrypticCommandEffect> { class CrypticCommandEffect extends OneShotEffect<CrypticCommandEffect> {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static {
filter.add(new ControllerPredicate(Constants.TargetController.NOT_YOU));
}
public CrypticCommandEffect() { public CrypticCommandEffect() {
super(Outcome.Tap); super(Outcome.Tap);
staticText = "tap all creatures your opponents control"; staticText = "tap all creatures your opponents control";
@ -124,17 +130,9 @@ class CrypticCommandEffect extends OneShotEffect<CrypticCommandEffect> {
if (player == null) { if (player == null) {
return false; return false;
} }
for (Permanent creature : game.getBattlefield().getActivePermanents(filter, player.getId(), source.getSourceId(), game)) {
for (UUID playerId : player.getInRange()) { creature.tap(game);
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new ControllerIdPredicate(playerId));
List<Permanent> creatures = game.getBattlefield().getActivePermanents(filter, player.getId(), source.getSourceId(), game);
for (Permanent creature : creatures) {
creature.tap(game);
}
} }
return true; return true;
} }