Merge branch 'master' into 'master'

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

View File

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