jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 03:28:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[DeckListModel] Fix exception precedence in legality check (#6535)

Browse source
This commit is contained in:
RickyRister 2026-01-19 00:28:13 -08:00 • committed by GitHub
parent f7e71a0868
commit 485d5a8b48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
View file

@ -709,8 +709,9 @@ static bool isCardQuantityLegalForFormat(const QString &format, const CardInfo &
auto formatRules = CardDatabaseManager::query()->getFormat(format); auto formatRules = CardDatabaseManager::query()->getFormat(format);
// if format has no custom rules, then just do the default check
if (!formatRules) { if (!formatRules) {
return true; return cardInfo.isLegalInFormat(format);
} }
// Exceptions always win // Exceptions always win
@ -758,11 +759,7 @@ void DeckListModel::refreshCardFormatLegalities()
} }
QString format = deckList->getGameFormat(); QString format = deckList->getGameFormat();
bool legal = exactCard.getInfo().isLegalInFormat(format); bool legal = isCardQuantityLegalForFormat(format, exactCard.getInfo(), currentCard->getNumber());
if (legal) {
legal = isCardQuantityLegalForFormat(format, exactCard.getInfo(), currentCard->getNumber());
}
currentCard->setFormatLegality(legal); currentCard->setFormatLegality(legal);
} }