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 () {