From 8ee89b60e812068d3d45645fee617246f472bec8 Mon Sep 17 00:00:00 2001
From: Ray Greenwell <ray@threerings.net>
Date: Fri, 7 Dec 2007 21:41:22 +0000
Subject: [PATCH] EZGame's done get gameWillReset(), so just clear the turn
 holder in gameWillStart.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@523 c613c5cb-e716-0410-b11b-feb51c14d237
---
 src/java/com/threerings/ezgame/server/EZGameManager.java | 3 +++
 .../com/threerings/ezgame/server/EZGameTurnDelegate.java | 9 ---------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/java/com/threerings/ezgame/server/EZGameManager.java b/src/java/com/threerings/ezgame/server/EZGameManager.java
index 8b333334..80f08cd1 100644
--- a/src/java/com/threerings/ezgame/server/EZGameManager.java
+++ b/src/java/com/threerings/ezgame/server/EZGameManager.java
@@ -646,6 +646,9 @@ public class EZGameManager extends GameManager
         // because the super's version of this function will immediately increment it, and then
         // distribute the new incremented value.
         _ezObj.roundId = 0;
+        // clear out the turn holder in case we're restarting
+        _ezObj.setTurnHolder(null);
+
         super.gameWillStart();
     }
 
diff --git a/src/java/com/threerings/ezgame/server/EZGameTurnDelegate.java b/src/java/com/threerings/ezgame/server/EZGameTurnDelegate.java
index 915868e9..33d916f4 100644
--- a/src/java/com/threerings/ezgame/server/EZGameTurnDelegate.java
+++ b/src/java/com/threerings/ezgame/server/EZGameTurnDelegate.java
@@ -42,15 +42,6 @@ public class EZGameTurnDelegate extends TurnGameManagerDelegate
         endTurn();
     }
 
-    @Override
-    public void gameWillReset ()
-    {
-        super.gameWillReset();
-
-        // make it nobody's turn
-        _turnGame.setTurnHolder(null);
-    }
-
     @Override
     protected void setFirstTurnHolder ()
     {