External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 13:02:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into master

Browse source
This commit is contained in:
Zzooouhh 2017-10-25 16:15:07 +02:00 • committed by GitHub
commit 7afb7eb2c5
11 changed files with 425 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/condition/common/YouGainedLifeCondition.java
View file

@ -27,7 +27,6 @@ public class YouGainedLifeCondition extends IntCompareCondition {
@Override
public String toString() {
return String.format("if you gained %s or more life this turn ", value);
return String.format("if you gained %s or more life this turn ", value + 1);
}
}

2
Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
View file

@ -270,7 +270,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
} else {
sb.append('P');
}
sb.append("put ").append(filter.getMessage()).append(" from among them onto the ");
sb.append("ut ").append(filter.getMessage()).append(" from among them onto the ");
} else {
sb.append(". Put ");
if (numberToPick.calculate(null, null, this) > 1) {