From ee6889395f73b62326c6400cec2367ec4071e12e Mon Sep 17 00:00:00 2001 From: Mark Johnson Date: Thu, 13 Mar 2008 20:21:48 +0000 Subject: [PATCH] This is throwing a wrench in bang, reverting it now and will take a better look at it later git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@571 c613c5cb-e716-0410-b11b-feb51c14d237 --- src/java/com/threerings/parlor/game/server/GameManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/parlor/game/server/GameManager.java b/src/java/com/threerings/parlor/game/server/GameManager.java index be82fa34..c21aab9d 100644 --- a/src/java/com/threerings/parlor/game/server/GameManager.java +++ b/src/java/com/threerings/parlor/game/server/GameManager.java @@ -421,7 +421,7 @@ public class GameManager extends PlaceManager public boolean startGame () { // complain if we're already started - if (_gameobj.isInPlay()) { + if (_gameobj.state == GameObject.IN_PLAY) { log.warning("Requested to start an already in-play game [game=" + where() + "]."); Thread.dumpStack(); return false; @@ -1075,7 +1075,7 @@ public class GameManager extends PlaceManager */ protected void announcePlayerGameOver (int pidx) { - systemMessage(GAME_MESSAGE_BUNDLE, + systemMessage(GAME_MESSAGE_BUNDLE, MessageBundle.tcompose(getPlayerGameOverMessage(pidx), getPlayerName(pidx))); }