From a7ae0f76a3763a92e8f4aaea5da7ba43a584b187 Mon Sep 17 00:00:00 2001 From: Ray Greenwell Date: Wed, 1 Sep 2004 21:03:11 +0000 Subject: [PATCH] Actually, moved isDraw() to GameObject, fixed bug.. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3114 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/puzzle/server/PuzzleManager.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/java/com/threerings/puzzle/server/PuzzleManager.java b/src/java/com/threerings/puzzle/server/PuzzleManager.java index 5e79a962d..56b988305 100644 --- a/src/java/com/threerings/puzzle/server/PuzzleManager.java +++ b/src/java/com/threerings/puzzle/server/PuzzleManager.java @@ -1,5 +1,5 @@ // -// $Id: PuzzleManager.java,v 1.14 2004/09/01 20:35:06 ray Exp $ +// $Id: PuzzleManager.java,v 1.15 2004/09/01 21:03:11 ray Exp $ // // Narya library - tools for developing networked games // Copyright (C) 2002-2004 Three Rings Design, Inc., All Rights Reserved @@ -447,22 +447,14 @@ public abstract class PuzzleManager extends GameManager sendStatusUpdate(); // report the winners and losers if appropriate - if (shouldConcludeGame() && !isDraw()) { + int winnerCount = _puzobj.getWinnerCount(); + if (shouldConcludeGame() && winnerCount > 0 && !_puzobj.isDraw()) { reportWinnersAndLosers(); } super.gameDidEnd(); } - /** - * Is the game a draw? - */ - protected boolean isDraw () - { - int winnerCount = _puzobj.getWinnerCount(); - return winnerCount > 0 && (winnerCount == _puzobj.getPlayerCount()); - } - /** * Report winner and loser oids to each room that any of the * winners/losers is in.