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

Merge branch 'master' into 'master'

Browse Source 
Fix the order of elements for Charm effect being random in the UI

Closes #940

See merge request core-developers/forge!1861
This commit is contained in:
Michael Kamensky
2019-06-15 19:13:42 +00:00
parent c08e20f2a7 ed818f1bd1
commit 3dd54e06e9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -1502,7 +1502,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
game.getTracker().unfreeze(); game.getTracker().unfreeze();
} }
final List<AbilitySub> possible = CharmEffect.makePossibleOptions(sa); final List<AbilitySub> possible = CharmEffect.makePossibleOptions(sa);
HashMap<SpellAbilityView, AbilitySub> spellViewCache = new HashMap<>(); LinkedHashMap<SpellAbilityView, AbilitySub> spellViewCache = new LinkedHashMap<>();
for (AbilitySub spellAbility : possible) { for (AbilitySub spellAbility : possible) {
spellViewCache.put(spellAbility.getView(), spellAbility); spellViewCache.put(spellAbility.getView(), spellAbility);
} }