From c81cf226590a37c503b269198d2e53b9fd85a1fd Mon Sep 17 00:00:00 2001 From: Walter Korman Date: Sat, 2 Nov 2002 01:20:59 +0000 Subject: [PATCH] Don't complain about receiving playerReady() for non-players if the game is a party game. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@1885 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../com/threerings/parlor/game/GameManager.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/java/com/threerings/parlor/game/GameManager.java b/src/java/com/threerings/parlor/game/GameManager.java index 476a9bade..3e641b337 100644 --- a/src/java/com/threerings/parlor/game/GameManager.java +++ b/src/java/com/threerings/parlor/game/GameManager.java @@ -1,5 +1,5 @@ // -// $Id: GameManager.java,v 1.52 2002/10/27 23:54:32 shaper Exp $ +// $Id: GameManager.java,v 1.53 2002/11/02 01:20:59 shaper Exp $ package com.threerings.parlor.game; @@ -704,13 +704,21 @@ public class GameManager extends PlaceManager { BodyObject plobj = (BodyObject)caller; - // make a note of this player's oid + // get the user's player index int pidx = _gameobj.getPlayerIndex(plobj.username); if (pidx == -1) { - Log.warning("Received playerReady() from non-player? " + - "[caller=" + caller + "]."); + // only complain if this is not a party game, since it's + // perfectly normal to receive a player ready notification + // from a user entering a party game in which they're not yet + // a participant + if (!_gameconfig.isPartyGame()) { + Log.warning("Received playerReady() from non-player? " + + "[caller=" + caller + "]."); + } return; } + + // make a note of this player's oid _playerOids[pidx] = plobj.getOid(); // if everyone is now ready to go, get things underway