Merge fix

magefree · Jul 24, 2021 · 1e4f352 · 1e4f352
1 parent c6a3d5e
commit 1e4f352
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -49,7 +49,7 @@ public boolean apply(Game game, Ability source) {
         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
@@ -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<CardInfo, Object> cardDao;
     private Set<String> classNames;
     private final RepositoryEventSource eventSource = new RepositoryEventSource();