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

Fix crash when taking over another player's turn

Browse Source
This commit is contained in:
drdev
2013-10-27 19:14:00 +00:00
parent c0cf6198a4
commit c85f14f27c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -47,6 +47,7 @@ import forge.game.zone.ZoneType;
import forge.gui.GuiDialog; import forge.gui.GuiDialog;
import forge.gui.SOverlayUtils; import forge.gui.SOverlayUtils;
import forge.gui.framework.SDisplayUtil; import forge.gui.framework.SDisplayUtil;
import forge.gui.framework.SLayoutIO;
import forge.gui.match.CMatchUI; import forge.gui.match.CMatchUI;
import forge.gui.match.VMatchUI; import forge.gui.match.VMatchUI;
import forge.gui.match.ViewWinLose; import forge.gui.match.ViewWinLose;
@@ -145,6 +146,7 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() {
CMatchUI.SINGLETON_INSTANCE.initHandViews(FServer.instance.getLobby().getGuiPlayer()); CMatchUI.SINGLETON_INSTANCE.initHandViews(FServer.instance.getLobby().getGuiPlayer());
SLayoutIO.loadLayout(null);
VMatchUI.SINGLETON_INSTANCE.populate(); VMatchUI.SINGLETON_INSTANCE.populate();
for(VHand h : VMatchUI.SINGLETON_INSTANCE.getHands()) { for(VHand h : VMatchUI.SINGLETON_INSTANCE.getHands()) {
h.getLayoutControl().updateHand(); h.getLayoutControl().updateHand();

2
src/main/java/forge/gui/match/VMatchUI.java
View File

@@ -83,7 +83,7 @@ public enum VMatchUI implements IVTopLevelUI {
} }
} }
// Add extra players alternatively to existing user/AI field panels. // Add extra players alternatively to existing user/AI field panels.
for (int i = 2; i < lstCommands.size(); i++) { for (int i = 2; i < lstCommands.size(); i++) {
// If already in layout, no need to add again. // If already in layout, no need to add again.
VCommand cmdView = lstCommands.get(i); VCommand cmdView = lstCommands.get(i);