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

Merge branch 'guiChoiceFixGameCache' into 'master'

Browse Source 
Player Human: fix chooseSingleEntityForEffect

See merge request core-developers/forge!2839
This commit is contained in:
Michael Kamensky
2020-05-29 07:19:44 +00:00
parent 0e831f88b9 379f9699e8
commit 3d32915d9f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-game/src/main/java/forge/game/Game.java
View File

@@ -545,6 +545,16 @@ public class Game {
} }
} }
public Card findByView(CardView view) {
CardIdVisitor visit = new CardIdVisitor(view.getId());
if (ZoneType.Stack.equals(view.getZone())) {
visit.visitAll(getStackZone());
} else {
visit.visitAll(getPlayer(view.getController()).getZone(view.getZone()));
}
return visit.getFound();
}
public Card findById(int id) { public Card findById(int id) {
CardIdVisitor visit = new CardIdVisitor(id); CardIdVisitor visit = new CardIdVisitor(id);
this.forEachCardInGame(visit); this.forEachCardInGame(visit);

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

@@ -465,7 +465,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
gameCacheChoose.getTrackableKeys(), delayedReveal, isOptional); gameCacheChoose.getTrackableKeys(), delayedReveal, isOptional);
endTempShowCards(); endTempShowCards();
if (result != null || !gameCacheChoose.containsKey(result)) { if (result == null || !gameCacheChoose.containsKey(result)) {
return null; return null;
} }
return gameCacheChoose.get(result); return gameCacheChoose.get(result);
@@ -3014,7 +3014,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
} }
public Card getCard(final CardView cardView) { public Card getCard(final CardView cardView) {
return getGame().findById(cardView.getId()); return getGame().findByView(cardView);
} }
public CardCollection getCardList(Iterable<CardView> cardViews) { public CardCollection getCardList(Iterable<CardView> cardViews) {