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

Fix so extra hand panes removed after losing control of another player

Browse Source
This commit is contained in:
drdev
2014-03-27 03:44:44 +00:00
parent 49a70ccf48
commit d43dfb788d
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui/src/main/java/forge/control/FControlGameEventHandler.java
View File

@@ -1,6 +1,7 @@
package forge.control; package forge.control;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;
import forge.FThreads; import forge.FThreads;
import forge.game.Game; import forge.game.Game;
import forge.game.card.Card; import forge.game.card.Card;
@@ -26,6 +27,7 @@ import forge.gui.toolbox.special.PhaseLabel;
import forge.net.FServer; import forge.net.FServer;
import forge.util.Lang; import forge.util.Lang;
import forge.util.maps.MapOfLists; import forge.util.maps.MapOfLists;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import java.util.*; import java.util.*;
@@ -118,14 +120,17 @@ public class FControlGameEventHandler extends IGameEventVisitor.Base<Void> {
return null; return null;
} }
FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { FThreads.invokeInEdtNowOrLater(new Runnable() {
CMatchUI.SINGLETON_INSTANCE.initHandViews(FServer.instance.getLobby().getGuiPlayer()); @Override
SLayoutIO.loadLayout(null); public void run() {
VMatchUI.SINGLETON_INSTANCE.populate(); CMatchUI.SINGLETON_INSTANCE.initHandViews(FServer.instance.getLobby().getGuiPlayer());
for (VHand h : VMatchUI.SINGLETON_INSTANCE.getHands()) { SLayoutIO.loadLayout(null);
h.getLayoutControl().updateHand(); VMatchUI.SINGLETON_INSTANCE.populate();
for (VHand h : VMatchUI.SINGLETON_INSTANCE.getHands()) {
h.getLayoutControl().updateHand();
}
} }
} }); });
return null; return null;
} }

9
forge-gui/src/main/java/forge/gui/match/VMatchUI.java
View File

@@ -119,6 +119,15 @@ public enum VMatchUI implements IVTopLevelUI {
} }
} }
// Remove any hand panels that aren't needed anymore
for (int i = EDocID.Hands.length - 1; i >= lstHands.size(); i--) {
DragCell cellWithHand = EDocID.Hands[i].getDoc().getParentCell();
if (cellWithHand != null) {
cellWithHand.removeDoc(EDocID.Hands[i].getDoc());
EDocID.Hands[i].setDoc(new VEmptyDoc(EDocID.Hands[i]));
}
}
// Fill in gaps // Fill in gaps
SwingUtilities.invokeLater(new Runnable() { SwingUtilities.invokeLater(new Runnable() {
@Override @Override