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

- Do not clear out deck Vanguard avatar on subsequent calls to selectVanguardAvatar (fixes Default Avatar not working).

Browse Source 
- Note that Vanguard selection is still partly broken (for desktop Forge), it's impossible to select a particular avatar for each player (the avatar always ends up being the same), fix is welcome.
This commit is contained in:
Agetian
2016-12-31 10:41:23 +00:00
parent 787c8decb7
commit 95ec8b63fa
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -533,7 +533,7 @@ public class VLobby implements ILobbyView {
final PlayerPanel pp = playerPanels.get(playerIndex); final PlayerPanel pp = playerPanels.get(playerIndex);
final CardDetailPanel cdp = vgdAvatarDetails.get(playerIndex); final CardDetailPanel cdp = vgdAvatarDetails.get(playerIndex);
final PaperCard vanguardAvatar; PaperCard vanguardAvatar = null;
final Deck deck = decks[playerIndex]; final Deck deck = decks[playerIndex];
if (selected instanceof PaperCard) { if (selected instanceof PaperCard) {
pp.setVanguardButtonText(((PaperCard) selected).getName()); pp.setVanguardButtonText(((PaperCard) selected).getName());
@@ -548,7 +548,7 @@ public class VLobby implements ILobbyView {
cdp.setVisible(false); cdp.setVisible(false);
if (sel == null) { if (sel == null) {
vanguardAvatar = null; return;
} else { } else {
if (sel.contains("Use deck's default avatar") && deck != null && deck.has(DeckSection.Avatar)) { if (sel.contains("Use deck's default avatar") && deck != null && deck.has(DeckSection.Avatar)) {
vanguardAvatar = deck.get(DeckSection.Avatar).get(0); vanguardAvatar = deck.get(DeckSection.Avatar).get(0);