github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1781 from spjspj/master

Browse source 
spjspj - 'Use first Mana ability' fixes
This commit is contained in:
spjspj 2016-04-05 21:48:01 +10:00
commit 705daab22f
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -596,7 +596,7 @@ public final class GamePanel extends javax.swing.JPanel {
setMenuStates(
PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT, "true").equals("true"),
PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT_ONLY_ONE, "true").equals("true"),
PreferencesDialog.getCachedValue(PreferencesDialog.KEY_USE_FIRST_MANA_ABILITY, "true").equals("true")
false
);
updateGame(game);

9
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -1255,10 +1255,11 @@ public class HumanPlayer extends PlayerImpl {
if (ability instanceof ManaAbility) {
activateAbility(ability, game);
return;
}
} else {
game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(abilities.values()));
}
}
}
game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(abilities.values()));
waitForResponse(game);
if (response.getUUID() != null && isInGame()) {
if (abilities.containsKey(response.getUUID())) {