From 2bee6e1ec9e1227f42db10dc5da3d1898e3edc1c Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sat, 20 Oct 2012 16:10:17 +0000 Subject: [PATCH] fixing restart issue and hand crash --- src/main/java/forge/game/MatchController.java | 1 + src/main/java/forge/gui/match/nonsingleton/VHand.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/forge/game/MatchController.java b/src/main/java/forge/game/MatchController.java index 674b12c2e14..27b1af9cbea 100644 --- a/src/main/java/forge/game/MatchController.java +++ b/src/main/java/forge/game/MatchController.java @@ -182,6 +182,7 @@ public class MatchController { */ public void replayRound() { gamesPlayed.remove(gamesPlayed.size() - 1); + startRound(); } /** diff --git a/src/main/java/forge/gui/match/nonsingleton/VHand.java b/src/main/java/forge/gui/match/nonsingleton/VHand.java index 19cab38bf4d..365600616b8 100644 --- a/src/main/java/forge/gui/match/nonsingleton/VHand.java +++ b/src/main/java/forge/gui/match/nonsingleton/VHand.java @@ -40,8 +40,6 @@ public class VHand implements IVDoc { private final EDocID docID; private final DragTab tab = new DragTab("Your Hand"); - // Other fields - private Player player = null; // Top-level containers private final JScrollPane scroller = new JScrollPane(); @@ -72,7 +70,7 @@ public class VHand implements IVDoc { hand.setOpaque(false); - control = new CHand(player, this); + control = new CHand(player0, this); } //========= Overridden methods