github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Little fixes to some cards.

Browse source
This commit is contained in:
Jeff 2015-01-17 23:39:28 -06:00
parent aa67d4fb79
commit d5c1f35aca
4 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/fatereforged/AtarkaWorldRender.java
View file

@ -109,7 +109,7 @@ class AtarkaWorldRenderEffect extends TriggeredAbilityImpl {
if (event.getType() == EventType.ATTACKER_DECLARED) { if (event.getType() == EventType.ATTACKER_DECLARED) {
Permanent attacker = game.getPermanent(event.getSourceId()); Permanent attacker = game.getPermanent(event.getSourceId());
if (attacker != null if (attacker != null
&& filter.match(attacker, game)) { && filter.match(attacker, sourceId, controllerId, game)) {
for (Effect effect : this.getEffects()) { for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(attacker.getId())); effect.setTargetPointer(new FixedTarget(attacker.getId()));
} }

2
Mage.Sets/src/mage/sets/fatereforged/MonasteryMentor.java
View file

@ -79,7 +79,7 @@ public class MonasteryMentor extends CardImpl {
MonasteryMentorToken() { MonasteryMentorToken() {
super("Monk", "1/1 white Monk creature token with prowess"); super("Monk", "1/1 white Monk creature token with prowess");
cardType.add(CardType.CREATURE); cardType.add(CardType.CREATURE);
color.setBlack(true); color.setWhite(true);
subtype.add("Monk"); subtype.add("Monk");
power = new MageInt(1); power = new MageInt(1);
toughness = new MageInt(1); toughness = new MageInt(1);

3
Mage.Sets/src/mage/sets/magic2015/GoblinRabblemaster.java
View file

@ -46,6 +46,7 @@ import mage.constants.Rarity;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SubtypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.ControllerPredicate; import mage.filter.predicate.permanent.ControllerPredicate;
@ -63,9 +64,11 @@ public class GoblinRabblemaster extends CardImpl {
static { static {
otherGoblinFilter.add(new AnotherPredicate()); otherGoblinFilter.add(new AnotherPredicate());
otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU)); otherGoblinFilter.add(new ControllerPredicate(TargetController.YOU));
otherGoblinFilter.add(new SubtypePredicate("Goblin"));
attackingFilter.add(new AttackingPredicate()); attackingFilter.add(new AttackingPredicate());
attackingFilter.add(new AnotherPredicate()); attackingFilter.add(new AnotherPredicate());
attackingFilter.add(new SubtypePredicate("Goblin"));
} }
public GoblinRabblemaster(UUID ownerId) { public GoblinRabblemaster(UUID ownerId) {

2
Mage.Sets/src/mage/sets/shadowmoor/DinOfTheFireherd.java
View file

@ -113,7 +113,7 @@ class DinOfTheFireherdEffect extends OneShotEffect {
effect.apply(game, source); effect.apply(game, source);
Effect effect2 = new SacrificeEffect(new FilterControlledLandPermanent(), redCreaturesControllerControls, "Target Opponent"); Effect effect2 = new SacrificeEffect(new FilterControlledLandPermanent(), redCreaturesControllerControls, "Target Opponent");
effect.setTargetPointer(new FixedTarget(targetOpponent.getId())); effect2.setTargetPointer(new FixedTarget(targetOpponent.getId()));
effect2.apply(game, source); effect2.apply(game, source);
applied = true; applied = true;
} }