From d065bfde1c3c5a93a1b99b2b03225f87d845581c Mon Sep 17 00:00:00 2001 From: Andrzej Kapolka Date: Fri, 22 Apr 2005 18:35:05 +0000 Subject: [PATCH] Return null for unoccupied positions in the player oid array. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@3520 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../parlor/card/server/CardGameManager.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/java/com/threerings/parlor/card/server/CardGameManager.java b/src/java/com/threerings/parlor/card/server/CardGameManager.java index 8b9305729..b302ff99a 100644 --- a/src/java/com/threerings/parlor/card/server/CardGameManager.java +++ b/src/java/com/threerings/parlor/card/server/CardGameManager.java @@ -158,11 +158,18 @@ public class CardGameManager extends GameManager } /** - * Returns the client object corresponding to the specified player index. + * Returns the client object corresponding to the specified player index, + * or null if the position is not occupied by a player. */ public ClientObject getClientObject (int pidx) { - return (ClientObject)PresentsServer.omgr.getObject(_playerOids[pidx]); + if (_playerOids[pidx] != 0) { + return (ClientObject)PresentsServer.omgr.getObject( + _playerOids[pidx]); + + } else { + return null; + } } /**