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

Merge pull request #3 from magefree/master

Browse source 
merge
This commit is contained in:
Sarah Souders 2019-11-29 22:11:27 -05:00 committed by GitHub
commit 897f72c4f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Pioneer.java
View file

@ -15,7 +15,7 @@ public class Pioneer extends Constructed {
public Pioneer() { public Pioneer() {
super("Constructed - Pioneer"); super("Constructed - Pioneer");
Date cutoff = new GregorianCalendar(2012, 10, 5).getTime(); // M15 release date Date cutoff = new GregorianCalendar(2012, 10, 5).getTime(); // RTR release date
for (ExpansionSet set : Sets.getInstance().values()) { for (ExpansionSet set : Sets.getInstance().values()) {
if (set.getSetType().isStandardLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) { if (set.getSetType().isStandardLegal() && (set.getReleaseDate().after(cutoff) || set.getReleaseDate().equals(cutoff))) {
setCodes.add(set.getCode()); setCodes.add(set.getCode());

2
Mage.Sets/src/mage/cards/e/EscapedShapeshifter.java
View file

@ -72,7 +72,7 @@ class EscapedShapeshifterEffect extends ContinuousEffectImpl {
source.getControllerId(), source.getSourceId(), game source.getControllerId(), source.getSourceId(), game
).stream() ).stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.filter(permanent -> !permanent.getName().equals(sourcePermanent.getName())) .filter(permanent -> !permanent.getName().equals("Escaped Shapeshifter"))
.map(Permanent::getAbilities) .map(Permanent::getAbilities)
.flatMap(Collection::stream).filter(EscapedShapeshifterEffect::checkAbility) .flatMap(Collection::stream).filter(EscapedShapeshifterEffect::checkAbility)
.forEach(ability -> sourcePermanent.addAbility(ability, source.getSourceId(), game)); .forEach(ability -> sourcePermanent.addAbility(ability, source.getSourceId(), game));

2
Mage.Sets/src/mage/sets/ReturnToRavnica.java
View file

@ -18,7 +18,7 @@ public final class ReturnToRavnica extends ExpansionSet {
} }
private ReturnToRavnica() { private ReturnToRavnica() {
super("Return to Ravnica", "RTR", ExpansionSet.buildDate(2012, 9, 29), SetType.EXPANSION); super("Return to Ravnica", "RTR", ExpansionSet.buildDate(2012, 10, 5), SetType.EXPANSION);
this.blockName = "Return to Ravnica"; this.blockName = "Return to Ravnica";
this.hasBoosters = true; this.hasBoosters = true;
this.numBoosterLands = 1; this.numBoosterLands = 1;