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

Merge fix

Browse source
This commit is contained in:
Oleg Agafonov 2021-07-25 01:16:12 +04:00
parent c6a3d5e588
commit 1e4f3524a9
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/common/EpicEffect.java
View file

@ -49,7 +49,7 @@ public class EpicEffect extends OneShotEffect {
if (spell == null) { if (spell == null) {
return false; 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); spell.getSpellAbility().getEffects().removeIf(EpicEffect.class::isInstance);
game.addDelayedTriggeredAbility(new AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility( game.addDelayedTriggeredAbility(new AtTheBeginOfYourNextUpkeepDelayedTriggeredAbility(
new EpicPushEffect(spell, rule), Duration.EndOfGame, false new EpicPushEffect(spell, rule), Duration.EndOfGame, false

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

@ -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 JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
private static final String VERSION_ENTITY_NAME = "card"; private static final String VERSION_ENTITY_NAME = "card";
// raise this if db structure was changed // 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 // 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 Dao<CardInfo, Object> cardDao;
private Set<String> classNames; private Set<String> classNames;
private final RepositoryEventSource eventSource = new RepositoryEventSource(); private final RepositoryEventSource eventSource = new RepositoryEventSource();