From 2d6bcd83f4c6f4acb60f1027afaf5206266861fb Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 16 Sep 2017 16:55:58 +0200 Subject: [PATCH] xmage 1.4.26V4 --- Mage.Common/src/main/java/mage/utils/MageVersion.java | 2 +- .../src/mage/player/human/HumanPlayer.java | 6 ++++-- .../src/main/java/mage/cards/repository/CardRepository.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Mage.Common/src/main/java/mage/utils/MageVersion.java b/Mage.Common/src/main/java/mage/utils/MageVersion.java index 0b45f8ca40..e0c0a9435a 100644 --- a/Mage.Common/src/main/java/mage/utils/MageVersion.java +++ b/Mage.Common/src/main/java/mage/utils/MageVersion.java @@ -41,7 +41,7 @@ public class MageVersion implements Serializable, Comparable { public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; public final static int MAGE_VERSION_PATCH = 26; - public final static String MAGE_VERSION_MINOR_PATCH = "V3"; + public final static String MAGE_VERSION_MINOR_PATCH = "V4"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 751e1739d2..69e89b0c08 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -1112,8 +1112,10 @@ public class HumanPlayer extends PlayerImpl { // attack selected default defender declareAttacker(attacker.getId(), attackedDefender, game, false); } -// } else if (response.getInteger() != null) { // Ok or F-Key - + } else if (response.getInteger() != null) { // F-Key + if (checkIfAttackersValid(game)) { + return; + } } else if (response.getBoolean() != null) { // ok button if (checkIfAttackersValid(game)) { return; diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 8224840662..36a866cf23 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -58,7 +58,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 51; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 90; + private static final long CARD_CONTENT_VERSION = 91; private Dao cardDao; private Set classNames;