--- a/jpoker/js/jquery.jpoker.js	Tue Aug 26 14:42:43 2008 +0000
+++ b/jpoker/js/jquery.jpoker.js	Tue Aug 26 15:05:28 2008 +0000
@@ -1169,10 +1169,14 @@
             rejoin: function() {
                 this.setState(this.MY);
                 var handler = function(server, game_id, packet) {
-                    if(packet.type == 'PacketPokerTableList') {
-                        for(var i = 0; i < packet.packets.length; i++) {
-                            var subpacket = packet.packets[i];
-                            server.tableJoin(subpacket.id);
+                    if(packet.type == 'PacketPokerPlayerPlaces') {
+                        for(var i = 0; i < packet.tables.length; i++) {
+                            var game_id = packet.tables[i];
+                            server.tableJoin(game_id);
+                        }
+                        for(var i = 0; i < packet.tourneys.length; i++) {
+                            var tourney_serial = packet.tourneys[i];
+                            server.tourneyJoin(tourney_serial);
                         }
                         server.getUserInfo();
                         server.setState(server.RUNNING, 'rejoin');
@@ -1181,7 +1185,7 @@
                     return true;
                 };
                 this.registerHandler(0, handler);
-                this.sendPacket({ type: 'PacketPokerTableSelect', string: 'my' });
+                this.sendPacket({ type: 'PacketPokerGetPlayerPlaces', serial: this.serial });
             },
             
             tableJoin: function(game_id) {
@@ -1207,7 +1211,7 @@
 			server.sendPacket({'type': 'PacketPokerTourneyRegister', 'serial': server.serial, 'game_id' : game_id});
 			server.registerHandler(game_id, function(server, game_id, packet) {
 				if (packet.type == 'PacketPokerTourneyRegister') {
-				    server.tourneyJoin(packet);
+				    server.tourneyJoin(packet.game_id);
 				    server.notifyUpdate(packet);
 				    server.queueRunning(function() {
 					    if (server.timers.tourneyDetails !== undefined) {
@@ -1275,10 +1279,10 @@
 		    });
 	    },
 
-	    tourneyJoin: function(packet) {
-		var tourney = new jpoker.tourney(this, packet);
+	    tourneyJoin: function(game_id) {
+		var tourney = new jpoker.tourney(this, game_id);
 		tourney.poll();
-		this.tourneys[packet.game_id] = tourney;
+		this.tourneys[game_id] = tourney;
 	    },
 	    
 	    getPersonalInfo : function() {
@@ -1582,11 +1586,12 @@
     //
     // tourney
     //
-    jpoker.tourney = function(server, packet) {
-        $.extend(this, jpoker.tourney.defaults, packet);
+    jpoker.tourney = function(server, game_id) {
+        $.extend(this, jpoker.tourney.defaults);
+	this.game_id = game_id;
         this.url = server.url;
         this.init();
-        server.registerHandler(packet.game_id, this.handler);
+        server.registerHandler(game_id, this.handler);
     };
 
     jpoker.tourney.defaults = {

--- a/jpoker/js/test-jpoker.js	Tue Aug 26 14:42:43 2008 +0000
+++ b/jpoker/js/test-jpoker.js	Tue Aug 26 15:05:28 2008 +0000
@@ -405,8 +405,7 @@
         var table_packet = { id: game_id };
         server.tables[game_id] = new jpoker.table(server, table_packet);
 	var tourney_serial = 43;
-	var tourney_packet = {game_id: tourney_serial };
-        server.tourneys[game_id] = new jpoker.tourney(server, table_packet);
+        server.tourneys[game_id] = new jpoker.tourney(server, tourney_serial);
 
 	server.tables[game_id].uninit = function() {
 	    ok(true, "table uninit called");	    
@@ -608,16 +607,17 @@
     });
 
 test("jpoker.server.rejoin", function(){
-        expect(4);
-        stop();
-
-        var server = jpoker.serverCreate({ url: 'url' });
-        var id = 'jpoker' + jpoker.serial;
-        var game_id = 100;
-
-        var PokerServer = function() {};
-        PokerServer.prototype = {
-            outgoing: '[{"type": "PacketPokerTableList", "packets": [{"id": ' + game_id + '}]}]',
+        expect(5);
+        stop();
+
+        var server = jpoker.serverCreate({ url: 'url' });
+        var id = 'jpoker' + jpoker.serial;
+        var game_id = 100;
+	var tourney_serial = 200;
+
+        var PokerServer = function() {};
+        PokerServer.prototype = {
+            outgoing: '[{"type": "PacketPokerPlayerPlaces", "tables": [' + game_id + '], "tourneys": [' + tourney_serial + ']}]',
 
             handle: function(packet) { }
         };
@@ -627,6 +627,10 @@
         server.tables[game_id] = new jpoker.table(server, table_packet);
         var table = server.tables[game_id];
         server.notifyUpdate(table_packet);
+
+        server.tourneys[tourney_serial] = new jpoker.tourney(server, tourney_serial);
+        var tourney = server.tourneys[tourney_serial];
+
         var player_serial = 43;
         var player_seat = 2;
         var player_name = 'username';
@@ -657,6 +661,9 @@
             });
         server.tableJoin = function(other_game_id) {
             equals(other_game_id, game_id, 'rejoin same table');
+        };
+        server.tourneyJoin = function(game_id) {
+            equals(game_id, tourney_serial, 'rejoin same tourney');
         };
 
         server.getUserInfo = function() {
@@ -890,7 +897,7 @@
 	
 	var game_id = 42;
         var server = jpoker.serverCreate({ url: 'url' });
-        server.tourneyJoin({game_id: game_id});
+        server.tourneyJoin(game_id);
 	ok(game_id in server.tourneys, 'tourney created');
 	ok(server.tourneys[game_id].pollTimer != -1, 'tourney pollTimer activated');
 	cleanup();
@@ -2044,7 +2051,7 @@
 
         var server = jpoker.serverCreate({ url: 'url' });
         var game_id = 100;
-        var tourney = new jpoker.tourney(server, { game_id: game_id });
+        var tourney = new jpoker.tourney(server, game_id);
         server.tourneys[game_id] = tourney;
         var notified = false;
         var handler = function() {
@@ -2059,7 +2066,7 @@
 test("jpoker.tourney.poll", function() {
 	expect(8);
 	var server = jpoker.serverCreate({ url: 'url' });
-	var tourney = new jpoker.tourney(server, {"type": "PacketPokerTourneyRegister", "game_id": 101});
+	var tourney = new jpoker.tourney(server, 101);
 	equals(tourney.pollTimer, -1, 'pollTimer not set');
 
 	server.sendPacket = function(packet) {
@@ -2095,8 +2102,7 @@
         var server = jpoker.serverCreate({ url: 'url' });
 
         var game_id = 100;
-        var tourney_packet = { game_id: game_id };
-        server.tourneys[game_id] = new jpoker.tourney(server, tourney_packet);
+        server.tourneys[game_id] = new jpoker.tourney(server, game_id);
         var tourney = server.tourneys[game_id];
 
         var packet = { 'type': 'PacketPing',