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

GameAction: checkStaticAbilities do CDA first

Browse Source
This commit is contained in:
Hanmac
2017-08-10 04:59:07 +00:00
parent c575c1bea3
commit c392deaf38
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -19,6 +19,7 @@ package forge.game;
import com.google.common.base.Predicate;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -715,11 +716,14 @@ public class GameAction {
}
});
// TODO Java 1.8 use comparingLong
final Comparator<StaticAbility> comp = new Comparator<StaticAbility>() {
@Override
public int compare(final StaticAbility a, final StaticAbility b) {
return Long.compare(a.getHostCard().getTimestamp(), b.getHostCard().getTimestamp());
return ComparisonChain.start()
.compareTrueFirst(a.hasParam("CharacteristicDefining"), b.hasParam("CharacteristicDefining"))
.compare(a.getHostCard().getTimestamp(), b.getHostCard().getTimestamp())
.result();
}
};
Collections.sort(staticAbilities, comp);