From 2d6bcd83f4c6f4acb60f1027afaf5206266861fb Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 16 Sep 2017 16:55:58 +0200 Subject: [PATCH 1/3] 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 0b45f8ca40a..e0c0a9435a3 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 751e1739d29..69e89b0c08e 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 82248406626..36a866cf23a 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; From e15f0206677bb5660ce6f65a37e7a4a52dc45f45 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 16 Sep 2017 22:51:12 +0200 Subject: [PATCH 2/3] Deathgorge Scavenger - Fixed triggered ability. --- .../src/mage/cards/d/DeathgorgeScavenger.java | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java b/Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java index 13b6ae13b3f..868409cd850 100644 --- a/Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java +++ b/Mage.Sets/src/mage/cards/d/DeathgorgeScavenger.java @@ -34,12 +34,12 @@ import mage.abilities.common.EntersBattlefieldOrAttacksSourceTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.Card; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -92,14 +92,16 @@ class DeathgorgeScavengerEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Card card = game.getCard(getTargetPointer().getFirst(game, source)); Player controller = game.getPlayer(source.getControllerId()); - if (controller != null && card != null) { - controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.GRAVEYARD, true); - if (card.isCreature()) { - controller.gainLife(2, game); - } else { - new BoostSourceEffect(1, 1, Duration.EndOfTurn).apply(game, source); + if (controller != null) { + Card card = game.getCard(getTargetPointer().getFirst(game, source)); + if (card != null) { + controller.moveCards(card, Zone.EXILED, source, game); + if (card.isCreature()) { + controller.gainLife(2, game); + } else { + game.addEffect(new BoostSourceEffect(1, 1, Duration.EndOfTurn), source); + } } return true; } From 01e4ce2c42836458b418c16d54e53d5c13543485 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 16 Sep 2017 22:56:03 +0200 Subject: [PATCH 3/3] * Marauding Looter - Fixed that the draw discard effect was not optional. --- Mage.Sets/src/mage/cards/m/MaraudingLooter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java index 317c96ced25..c87a6297a66 100644 --- a/Mage.Sets/src/mage/cards/m/MaraudingLooter.java +++ b/Mage.Sets/src/mage/cards/m/MaraudingLooter.java @@ -57,7 +57,7 @@ public class MaraudingLooter extends CardImpl { // Raid - At the beginning of your end step, if you attacked with a creature this turn, you may draw a card. If you do, discard a card. Ability ability = new ConditionalTriggeredAbility( - new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1), TargetController.YOU, false), + new BeginningOfEndStepTriggeredAbility(new DrawDiscardControllerEffect(1, 1, true), TargetController.YOU, false), RaidCondition.instance, "Raid — At the beginning of your end step, " + "if you attacked with a creature this turn, "