From daec25d27c6b88e3c0807580810c3254493808c3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Thu, 6 Dec 2007 01:42:02 +0000
Subject: [PATCH] Avoid name collision.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@516 c613c5cb-e716-0410-b11b-feb51c14d237
---
 src/java/com/threerings/parlor/data/Table.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/java/com/threerings/parlor/data/Table.java b/src/java/com/threerings/parlor/data/Table.java
index 132d607e..41e3456f 100644
--- a/src/java/com/threerings/parlor/data/Table.java
+++ b/src/java/com/threerings/parlor/data/Table.java
@@ -165,16 +165,16 @@ public class Table
 
         // FFA party games have 0-length players array, and non-party games will have the players
         // who are ready-to-go for the game start.
-        Name[] players = new Name[getOccupiedCount()];
+        Name[] plist = new Name[getOccupiedCount()];
         if (players != null) {
             for (int ii = 0, dex = 0; ii < players.length; ii++) {
                 if (players[ii] != null) {
-                    players[dex++] = players[ii];
+                    plist[dex++] = players[ii];
                 }
             }
         }
 
-        return players;
+        return plist;
     }
 
     /**
@@ -191,13 +191,13 @@ public class Table
         // compress the team indexes down
         ArrayIntSet set = new ArrayIntSet();
         int[][] newTeams = new int[teams.length][];
-        Name[] players = getPlayers();
+        Name[] plist = getPlayers();
         for (int ii=0; ii < teams.length; ii++) {
             set.clear();
             for (int jj=0; jj < teams[ii].length; jj++) {
-                Name occ = players[teams[ii][jj]];
+                Name occ = plist[teams[ii][jj]];
                 if (occ != null) {
-                    set.add(ListUtil.indexOf(players, occ));
+                    set.add(ListUtil.indexOf(plist, occ));
                 }
             }
             newTeams[ii] = set.toIntArray();