From 2421eeb696666b827e54ec786a2358a81fa1d0ea Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Wed, 20 Apr 2005 01:53:49 +0000 Subject: [PATCH] Moved cleanup code to gameDidEnd. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3507 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../card/trick/server/TrickCardGameManagerDelegate.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java index c51d3a3a4..eba88f03c 100644 --- a/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java +++ b/src/java/com/threerings/parlor/card/trick/server/TrickCardGameManagerDelegate.java @@ -113,8 +113,10 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate } // Documentation inherited. - public void gameWillEnd () + public void gameDidEnd () { + super.gameDidEnd(); + // make sure all intervals are cancelled _turnTimeoutInterval.cancel(); _endTrickInterval.cancel(); @@ -127,9 +129,7 @@ public class TrickCardGameManagerDelegate extends TurnGameManagerDelegate // initialize the array of rematch requests _trickCardGame.setRematchRequests( - new int[_cardGame.getPlayerCount()]); - - super.gameDidEnd(); + new int[_cardGame.getPlayerCount()]); } // Documentation inherited.