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 branch 'patch-4' into 'master'

Browse Source 
Fix slowness when removing a card from a deck by only getting the key once instead of twice.

See merge request core-developers/forge!77
This commit is contained in:
Sol
2018-01-12 04:04:29 +00:00
parent 3795232b2c 8003ade509
commit 72e7822616
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ public enum ColumnDef {
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return toCollectorPrefix(from.getKey()) + " " + toSortableName(from.getKey().getName());
return toCollectorPrefix(from.getKey());
}
},
new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@@ -520,7 +520,7 @@ public enum ColumnDef {
//this is a multi-layer sort. coding it in layers to make it easier to manipulate.
private static String toCollectorPrefix(final InventoryItem i) {
//make sure it's a card. if not, pointless to proceed.
return i instanceof PaperCard ? toBasicLandsLast(i) : "";
return (i instanceof PaperCard ? ((IPaperCard) i).getCollectorIndex() + " ": "") + toSortableName(i.getName());
}
//lands after other cards