AfflictionNetworks/vilya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No need to wait for didStartup() to create this set.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@444 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
Michael Bayne
2007-10-08 17:14:17 +00:00
parent 2862b32763
commit a88a5a3482
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/parlor/game/server/GameManager.java
+1 -6
View File
@@ -774,9 +774,6 @@ public class GameManager extends PlaceManager
// instantiate a player oid array which we'll fill in later // instantiate a player oid array which we'll fill in later
_playerOids = new int[getPlayerSlots()]; _playerOids = new int[getPlayerSlots()];
// instantiate the pending player list
_pendingOids = new ArrayIntSet();
// give delegates a chance to do their thing // give delegates a chance to do their thing
super.didStartup(); super.didStartup();
@@ -1154,9 +1151,7 @@ public class GameManager extends PlaceManager
// clear out player readiness; everyone must report as ready again to restart the game // clear out player readiness; everyone must report as ready again to restart the game
Arrays.fill(_playerOids, 0); Arrays.fill(_playerOids, 0);
if (_pendingOids != null) {
_pendingOids.clear(); _pendingOids.clear();
}
// report the winners and losers if appropriate // report the winners and losers if appropriate
int winnerCount = _gameobj.getWinnerCount(); int winnerCount = _gameobj.getWinnerCount();
@@ -1299,7 +1294,7 @@ public class GameManager extends PlaceManager
protected int[] _playerOids; protected int[] _playerOids;
/** The list of players that have arrived in the room, but are not ready to play. */ /** The list of players that have arrived in the room, but are not ready to play. */
protected ArrayIntSet _pendingOids; protected ArrayIntSet _pendingOids = new ArrayIntSet();
/** If AIs are present, contains their configuration, or null at human player indexes. */ /** If AIs are present, contains their configuration, or null at human player indexes. */
protected GameAI[] _AIs; protected GameAI[] _AIs;