mirror of
https://github.com/magefree/mage.git
synced 2025-12-25 13:02:06 -08:00
Merge origin/master
Conflicts: Mage.Client/src/main/java/org/mage/card/arcane/ManaSymbols.java
This commit is contained in:
commit
3f57012c85
5 changed files with 81 additions and 48 deletions
|
|
@ -52,7 +52,9 @@ public class RateCard {
|
|||
*/
|
||||
public static int rateCard(Card card, List<ColoredManaSymbol> allowedColors) {
|
||||
if (allowedColors == null && rated.containsKey(card.getName())) {
|
||||
return rated.get(card.getName());
|
||||
int rate = rated.get(card.getName());
|
||||
// log.info(card.getName() + " rate: " + rate);
|
||||
return rate;
|
||||
}
|
||||
int type;
|
||||
if (card.getCardType().contains(CardType.PLANESWALKER)) {
|
||||
|
|
@ -136,7 +138,7 @@ public class RateCard {
|
|||
*/
|
||||
private synchronized static void readRatings() {
|
||||
if (ratings == null) {
|
||||
ratings = new HashMap<String, Integer>();
|
||||
ratings = new HashMap<>();
|
||||
readFromFile("/m13.csv");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue