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

Xmage 1.4.24.V1

Browse source
This commit is contained in:
LevelX2 2017-07-09 01:29:26 +02:00
parent da6a4bd614
commit 8e666c9403
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/main/java/mage/utils/MageVersion.java
View file

@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MAJOR = 1;
public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_MINOR = 4;
public final static int MAGE_VERSION_PATCH = 24; public final static int MAGE_VERSION_PATCH = 24;
public final static String MAGE_VERSION_MINOR_PATCH = "V0"; public final static String MAGE_VERSION_MINOR_PATCH = "V1";
public final static String MAGE_VERSION_INFO = ""; public final static String MAGE_VERSION_INFO = "";
private final int major; private final int major;

6
Mage.Sets/src/mage/cards/f/FatalPush.java
View file

@ -27,6 +27,7 @@
*/ */
package mage.cards.f; package mage.cards.f;
import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.condition.common.RevoltCondition; import mage.abilities.condition.common.RevoltCondition;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
@ -40,8 +41,6 @@ import mage.players.Player;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import mage.watchers.common.RevoltWatcher; import mage.watchers.common.RevoltWatcher;
import java.util.UUID;
/** /**
* *
* @author emerald000 * @author emerald000
@ -91,7 +90,8 @@ class FatalPushEffect extends OneShotEffect {
Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source)); Permanent targetCreature = game.getPermanent(this.getTargetPointer().getFirst(game, source));
if (targetCreature != null) { if (targetCreature != null) {
int cmc = targetCreature.getConvertedManaCost(); int cmc = targetCreature.getConvertedManaCost();
if (cmc <= 2 || (RevoltCondition.instance.apply(game, source) && cmc <= 4)) { if (cmc <= 2
|| (RevoltCondition.instance.apply(game, source) && cmc <= 4)) {
targetCreature.destroy(source.getSourceId(), game, false); targetCreature.destroy(source.getSourceId(), game, false);
} }
} }

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -58,7 +58,7 @@ public enum CardRepository {
// raise this if db structure was changed // raise this if db structure was changed
private static final long CARD_DB_VERSION = 51; private static final long CARD_DB_VERSION = 51;
// raise this if new cards were added to the server // raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 82; private static final long CARD_CONTENT_VERSION = 83;
private final TreeSet<String> landTypes = new TreeSet<>(); private final TreeSet<String> landTypes = new TreeSet<>();
private Dao<CardInfo, Object> cardDao; private Dao<CardInfo, Object> cardDao;
private Set<String> classNames; private Set<String> classNames;