From 1e4f3524a961aa63da612b124ea852700dcf1a2a Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sun, 25 Jul 2021 01:16:12 +0400 Subject: [PATCH] Merge fix --- .../main/java/mage/abilities/effects/common/EpicEffect.java | 2 +- Mage/src/main/java/mage/cards/repository/CardRepository.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java index 87f7eb6a92..81b1f63db0 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java @@ -49,7 +49,7 @@ public class EpicEffect extends OneShotEffect { if (spell == null) { return false; } - spell = spell.copy(); + spell = spell.copy(); // it's a fake spell (template), real copy with events in EpicPushEffect spell.getSpellAbility().getEffects().removeIf(EpicEffect.class::isInstance); game.addDelayedTriggeredAbility(new AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility( new EpicPushEffect(spell, rule), Duration.EndOfGame, false diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index cccfeb79c4..cca6bc97b0 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -34,9 +34,9 @@ public enum CardRepository { private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE"; private static final String VERSION_ENTITY_NAME = "card"; // raise this if db structure was changed - private static final long CARD_DB_VERSION = 54; + private static final long CARD_DB_VERSION = 53; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 238; + private static final long CARD_CONTENT_VERSION = 239; private Dao cardDao; private Set classNames; private final RepositoryEventSource eventSource = new RepositoryEventSource();