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

Accounting for any null in CardEdition - for those cards not having one.

Browse Source
This commit is contained in:
leriomaggio
2021-07-29 12:18:44 +01:00
parent a9f64a52e0
commit 5cc9ddb041
1 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -17,28 +17,13 @@
*/
package forge.itemmanager;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map.Entry;
import forge.gamemodes.limited.CardRanker;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Function;
import forge.card.CardAiHints;
import forge.card.CardEdition;
import forge.card.CardRarity;
import forge.card.CardRules;
import forge.card.CardSplitType;
import forge.card.CardType;
import forge.card.ColorSet;
import forge.card.ICardFace;
import forge.card.MagicColor;
import forge.card.*;
import forge.card.mana.ManaCost;
import forge.deck.DeckProxy;
import forge.deck.io.DeckPreferences;
import forge.game.GameFormat;
import forge.gamemodes.limited.CardRanker;
import forge.gui.card.CardPreferences;
import forge.item.IPaperCard;
import forge.item.InventoryItem;
@@ -48,6 +33,11 @@ import forge.itemmanager.ItemColumnConfig.SortState;
import forge.model.FModel;
import forge.util.CardTranslation;
import forge.util.Localizer;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map.Entry;
public enum ColumnDef {
/**
@@ -463,7 +453,10 @@ public enum ColumnDef {
new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@Override
public Object apply(final Entry<? extends InventoryItem, Integer> from) {
return toDeck(from.getKey()).getEdition().getCode();
CardEdition deckEdition = toDeck(from.getKey()).getEdition();
if (deckEdition != null)
return deckEdition.getCode();
return null;
}
}),
/**