external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring

Browse Source
This commit is contained in:
leriomaggio
2021-08-13 11:25:38 +01:00
parent 6d8e935203 678bd9a9e1
commit 258f57e080
455 changed files with 9122 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardType.java
View File

@@ -477,7 +477,7 @@ public final class CardType implements Comparable<CardType>, CardTypeView {
}
// we assume that changes are already correctly ordered (taken from TreeMap.values())
for (final CardChangedType ct : changedCardTypes) {
if(null == newType)
if (null == newType)
newType = new CardType(CardType.this);
if (ct.isRemoveCardTypes()) {