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

Use caching for CombatView (plus some random NPE and concurrency fixes).

Browse Source
This commit is contained in:
elcnesh
2014-09-26 07:38:47 +00:00
parent 3c411f3a3c
commit 3f1f199537
18 changed files with 119 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/screens/match/TargetingOverlay.java
View File

@@ -45,6 +45,7 @@ import forge.view.CardView;
import forge.view.CombatView;
import forge.view.FView;
import forge.view.GameEntityView;
import forge.view.IGameView;
import forge.view.arcane.CardPanel;
/**
@@ -364,7 +365,10 @@ public enum TargetingOverlay {
if (overlaystate == 0) { return; }
// Arc drawing
assembleArcs(MatchUtil.getGameView().getCombat());
final IGameView gameView = MatchUtil.getGameView();
if (gameView != null) {
assembleArcs(gameView.getCombat());
}
if (arcsCombat.isEmpty() && arcsOther.isEmpty()) { return; }

4
forge-gui-desktop/src/main/java/forge/screens/match/VMatchUI.java
View File

@@ -8,6 +8,7 @@ import forge.sound.MusicPlaylist;
import forge.sound.SoundSystem;
import forge.toolbox.FButton;
import forge.view.FView;
import forge.view.IGameView;
import javax.swing.*;
@@ -207,7 +208,8 @@ public enum VMatchUI implements IVTopLevelUI {
*/
@Override
public boolean onClosing(FScreen screen) {
if (!MatchUtil.getGameView().isGameOver()) {
final IGameView gameView = MatchUtil.getGameView();
if (gameView != null && !gameView.isGameOver()) {
MatchUtil.concede();
return false; //delay hiding tab even if concede successful
}