removing ratings from CardPrinted

This commit is contained in:
Maxmtg
2013-02-19 13:28:49 +00:00
parent e29fedf80e
commit dcc933b440
2 changed files with 5 additions and 7 deletions

View File

@@ -35,6 +35,7 @@ import forge.card.CardEdition;
import forge.card.CardRarity;
import forge.card.mana.ManaCost;
import forge.deck.DeckBase;
import forge.game.limited.DraftRankCache;
import forge.gui.deckeditor.CDeckEditorUI;
import forge.gui.deckeditor.SEditorIO;
import forge.gui.deckeditor.controllers.ACEditorBase;
@@ -366,7 +367,10 @@ public final class SColumnUtil {
private static Double toRankingCmp(final InventoryItem i) {
Double ranking = 500D;
if (i != null && i instanceof CardPrinted){
ranking = ((CardPrinted) i).getRanking() != null ? ((CardPrinted) i).getRanking() : 500D;
CardPrinted cp = (CardPrinted) i;
ranking = DraftRankCache.getRanking(cp.getName(), cp.getEdition());
if ( ranking == null )
ranking = 500D;
}
return ranking;
}

View File

@@ -32,8 +32,6 @@ import forge.CardUtil;
import forge.Singletons;
import forge.card.CardRarity;
import forge.card.CardRules;
import forge.game.limited.DraftRankCache;
import forge.game.limited.ReadDraftRankings;
import forge.game.player.Player;
import forge.util.PredicateString;
@@ -167,10 +165,6 @@ public final class CardPrinted implements Comparable<CardPrinted>, InventoryItem
public String getItemType() {
return "Card";
}
public Double getRanking(){
return DraftRankCache.getRanking(name, edition);
}
/**
* Lambda to get rules for selects from list of printed cards.