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

wrongly changed the equals to == for those files

Browse source
This commit is contained in:
ingmargoudt 2017-03-02 16:41:38 +01:00
parent 39c9420ad2
commit 9c71596fd8
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AeonChronicler.java
View file

@ -27,6 +27,7 @@
*/ */
package mage.cards.a; package mage.cards.a;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.TriggeredAbilityImpl; import mage.abilities.TriggeredAbilityImpl;
@ -101,7 +102,7 @@ class AeonChroniclerTriggeredAbility extends TriggeredAbilityImpl {
@Override @Override
public boolean checkTrigger(GameEvent event, Game game) { public boolean checkTrigger(GameEvent event, Game game) {
return event.getData() == CounterType.TIME.getName() && event.getTargetId().equals(this.getSourceId()); return Objects.equals(event.getData(), CounterType.TIME.getName()) && event.getTargetId().equals(this.getSourceId());
} }
@Override @Override

5
Mage.Sets/src/mage/cards/i/IllusionistsGambit.java
View file

@ -28,6 +28,7 @@
package mage.cards.i; package mage.cards.i;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility; import mage.abilities.common.CastOnlyDuringPhaseStepSourceAbility;
@ -147,7 +148,7 @@ class IllusionistsGambitRequirementEffect extends RequirementEffect {
@Override @Override
public boolean isInactive(Ability source, Game game) { public boolean isInactive(Ability source, Game game) {
if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) { if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) {
if (game.getTurn().getPhase() != phase) { if (!Objects.equals(game.getTurn().getPhase(), phase)) {
return true; return true;
} }
} }
@ -191,7 +192,7 @@ class IllusionistsGambitRestrictionEffect extends RestrictionEffect {
@Override @Override
public boolean isInactive(Ability source, Game game) { public boolean isInactive(Ability source, Game game) {
if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) { if (game.getTurn().getStepType() == PhaseStep.END_COMBAT) {
if (game.getTurn().getPhase() != phase) { if (!Objects.equals(game.getTurn().getPhase(), phase)) {
return true; return true;
} }
} }