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
This commit is contained in:
@@ -421,7 +421,7 @@ public class GameManager extends PlaceManager
|
|||||||
public boolean startGame ()
|
public boolean startGame ()
|
||||||
{
|
{
|
||||||
// complain if we're already started
|
// 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() + "].");
|
log.warning("Requested to start an already in-play game [game=" + where() + "].");
|
||||||
Thread.dumpStack();
|
Thread.dumpStack();
|
||||||
return false;
|
return false;
|
||||||
@@ -1075,7 +1075,7 @@ public class GameManager extends PlaceManager
|
|||||||
*/
|
*/
|
||||||
protected void announcePlayerGameOver (int pidx)
|
protected void announcePlayerGameOver (int pidx)
|
||||||
{
|
{
|
||||||
systemMessage(GAME_MESSAGE_BUNDLE,
|
systemMessage(GAME_MESSAGE_BUNDLE,
|
||||||
MessageBundle.tcompose(getPlayerGameOverMessage(pidx), getPlayerName(pidx)));
|
MessageBundle.tcompose(getPlayerGameOverMessage(pidx), getPlayerName(pidx)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user