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

* Gemstone Mine - Fixed that it did not produce mana anymore.

Browse source
This commit is contained in:
LevelX2 2014-09-10 00:18:49 +02:00
parent f137f9c49c
commit d2b252b517
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Mage.Sets/src/mage/sets/timeshifted/GemstoneMine.java
View file

@ -28,11 +28,7 @@
package mage.sets.timeshifted; package mage.sets.timeshifted;
import java.util.UUID; import java.util.UUID;
import mage.constants.CardType;
import mage.constants.Rarity;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.StateTriggeredAbility;
import mage.abilities.common.EntersBattlefieldAbility; import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.common.SourceHasCounterCondition; import mage.abilities.condition.common.SourceHasCounterCondition;
import mage.abilities.costs.common.RemoveCountersSourceCost; import mage.abilities.costs.common.RemoveCountersSourceCost;
@ -41,14 +37,12 @@ import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.mana.AnyColorManaAbility; import mage.abilities.mana.AnyColorManaAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.Zone; import mage.constants.CardType;
import mage.constants.Rarity;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
/** /**
* *

6
Mage/src/mage/abilities/decorator/ConditionalOneShotEffect.java
View file

@ -70,12 +70,12 @@ public class ConditionalOneShotEffect extends OneShotEffect {
if (condition.apply(game, source)) { if (condition.apply(game, source)) {
effect.setTargetPointer(this.targetPointer); effect.setTargetPointer(this.targetPointer);
return effect.apply(game, source); return effect.apply(game, source);
} else if (otherwiseEffect != null) { } else if (otherwiseEffect == null) {
return true; // nothing to do - no problem
}
otherwiseEffect.setTargetPointer(this.targetPointer); otherwiseEffect.setTargetPointer(this.targetPointer);
return otherwiseEffect.apply(game, source); return otherwiseEffect.apply(game, source);
} }
return false;
}
@Override @Override
public ConditionalOneShotEffect copy() { public ConditionalOneShotEffect copy() {