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

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

Browse source
This commit is contained in:
Evan Kranzler 2019-01-13 17:36:42 -05:00
commit 9aac44b52a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/g/GateColossus.java
View file

@ -65,7 +65,7 @@ public final class GateColossus extends CardImpl {
class GateColossusCostReductionEffect extends CostModificationEffectImpl { class GateColossusCostReductionEffect extends CostModificationEffectImpl {
static final FilterControlledPermanent filter = new FilterControlledPermanent(); static final FilterControlledPermanent filter = new FilterControlledPermanent("a Gate");
static { static {
filter.add(new SubtypePredicate(SubType.GATE)); filter.add(new SubtypePredicate(SubType.GATE));

2
Mage/src/main/java/mage/abilities/keyword/RiotAbility.java
View file

@ -71,7 +71,7 @@ class RiotReplacementEffect extends ReplacementEffectImpl {
Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget(); Permanent creature = ((EntersTheBattlefieldEvent) event).getTarget();
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (creature != null && controller != null) { if (creature != null && controller != null) {
if (controller.chooseUse(outcome, "Have " + creature.getLogName() + " enter the battlefield with a +1/+1 counter on it? (If you don't it has haste)", source, game)) { if (controller.chooseUse(outcome, "Have " + creature.getLogName() + " enter the battlefield with a +1/+1 counter on it or with haste?","", "+1/+1 counter", "Haste", source, game)) {
if (!game.isSimulation()) { if (!game.isSimulation()) {
game.informPlayers(controller.getLogName() + " choose to put a +1/+1 counter on " + creature.getName()); game.informPlayers(controller.getLogName() + " choose to put a +1/+1 counter on " + creature.getName());
} }