Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed a problem that prevented cards from beeing marked as choosable in select card panel after the changes made for displaying resized counters.

Browse source
This commit is contained in:
LevelX2 2014-10-31 18:34:41 +01:00
parent e5e1a5db40
commit 1396760d5e
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
View file

@ -1163,7 +1163,10 @@ public class CardPanel extends MagePermanent implements MouseListener, MouseMoti
@Override
public void componentResized(ComponentEvent ce) {
doLayout();
if (updateCard != null) {
// this update removes the isChoosable mark from targetCardsInLibrary
// so only done for permanents because it's needed to redraw counters in different size, if window size was changed
// no perfect solution yet (maybe also other not wanted effects for PermanentView objects)
if (updateCard != null && (updateCard instanceof PermanentView)) {
update(updateCard);
}
}

2
Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java
View file

@ -1249,7 +1249,7 @@ public class ComputerPlayer extends PlayerImpl implements Player {
return true;
}
ArrayList<Card> cardChoices = new ArrayList<Card>(cards.getCards(target.getFilter(), game));
ArrayList<Card> cardChoices = new ArrayList<>(cards.getCards(target.getFilter(), game));
while (!target.doneChosing()) {
Card card = pickTarget(cardChoices, outcome, target, source, game);
if (card != null) {