Considering protocol changes in tests.

tests/src/pokerth_protocol/GameStartModeRejoin.java

@@ -19,6 +19,11 @@ import org.bn.types.*;
     @ASN1Sequence ( name = "GameStartModeRejoin", isSet = false )
     public class GameStartModeRejoin implements IASN1PreparedElement {
             
+        @ASN1Element ( name = "handNum", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private NonZeroId handNum = null;
+                
+  
 @ASN1SequenceOf( name = "rejoinPlayerData", isSetOf = false ) 
 
     @ASN1ValueRangeConstraint ( 
@@ -35,6 +40,18 @@ import org.bn.types.*;
                 
   
         
+        public NonZeroId getHandNum () {
+            return this.handNum;
+        }
+
+        
+
+        public void setHandNum (NonZeroId value) {
+            this.handNum = value;
+        }
+        
+  
+        
         public java.util.Collection<RejoinPlayerData>  getRejoinPlayerData () {
             return this.rejoinPlayerData;
         }

tests/src/pokerth_protocol/InitMessage.java

@@ -41,6 +41,21 @@ import org.bn.types.*;
 	private Guid myLastSessionId = null;
                 
   
+    @ASN1String( name = "", 
+        stringType = UniversalTag.UTF8String , isUCS = false )
+    @ASN1ValueRangeConstraint ( 
+		
+		min = 1L, 
+		
+		max = 64L 
+		
+	   )
+	   
+        @ASN1Element ( name = "authServerPassword", isOptional =  true , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private String authServerPassword = null;
+                
+  
         
     @ASN1PreparedElement
     @ASN1Choice ( name = "login" )
@@ -195,6 +210,22 @@ import org.bn.types.*;
         
   
         
+        public String getAuthServerPassword () {
+            return this.authServerPassword;
+        }
+
+        
+        public boolean isAuthServerPasswordPresent () {
+            return this.authServerPassword != null;
+        }
+        
+
+        public void setAuthServerPassword (String value) {
+            this.authServerPassword = value;
+        }
+        
+  
+        
         public LoginChoiceType getLogin () {
             return this.login;
         }

tests/src/pokerth_protocol/JoinExistingGame.java

@@ -24,6 +24,21 @@ import org.bn.types.*;
 	private NonZeroId gameId = null;
                 
   
+    @ASN1String( name = "", 
+        stringType = UniversalTag.UTF8String , isUCS = false )
+    @ASN1ValueRangeConstraint ( 
+		
+		min = 1L, 
+		
+		max = 64L 
+		
+	   )
+	   
+        @ASN1Element ( name = "password", isOptional =  true , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private String password = null;
+                
+  
         
         public NonZeroId getGameId () {
             return this.gameId;
@@ -36,6 +51,22 @@ import org.bn.types.*;
         }
         
   
+        
+        public String getPassword () {
+            return this.password;
+        }
+
+        
+        public boolean isPasswordPresent () {
+            return this.password != null;
+        }
+        
+
+        public void setPassword (String value) {
+            this.password = value;
+        }
+        
+  
                     
         
         public void initWithDefaults() {

tests/src/pokerth_protocol/JoinGameRequestMessage.java

@@ -137,21 +137,6 @@ import org.bn.types.*;
     
 	private JoinGameActionChoiceType joinGameAction = null;
                 
-  
-    @ASN1String( name = "", 
-        stringType = UniversalTag.UTF8String , isUCS = false )
-    @ASN1ValueRangeConstraint ( 
-		
-		min = 1L, 
-		
-		max = 64L 
-		
-	   )
-	   
-        @ASN1Element ( name = "password", isOptional =  true , hasTag =  false  , hasDefaultValue =  false  )
-    
-	private String password = null;
-                
   @ASN1Boolean( name = "" )
     
         @ASN1Element ( name = "autoLeave", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
@@ -172,22 +157,6 @@ import org.bn.types.*;
         
   
         
-        public String getPassword () {
-            return this.password;
-        }
-
-        
-        public boolean isPasswordPresent () {
-            return this.password != null;
-        }
-        
-
-        public void setPassword (String value) {
-            this.password = value;
-        }
-        
-  
-        
         public Boolean getAutoLeave () {
             return this.autoLeave;
         }

tests/src/pokerth_protocol/JoinNewGame.java

@@ -24,6 +24,21 @@ import org.bn.types.*;
 	private NetGameInfo gameInfo = null;
                 
   
+    @ASN1String( name = "", 
+        stringType = UniversalTag.UTF8String , isUCS = false )
+    @ASN1ValueRangeConstraint ( 
+		
+		min = 1L, 
+		
+		max = 64L 
+		
+	   )
+	   
+        @ASN1Element ( name = "password", isOptional =  true , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private String password = null;
+                
+  
         
         public NetGameInfo getGameInfo () {
             return this.gameInfo;
@@ -36,6 +51,22 @@ import org.bn.types.*;
         }
         
   
+        
+        public String getPassword () {
+            return this.password;
+        }
+
+        
+        public boolean isPasswordPresent () {
+            return this.password != null;
+        }
+        
+
+        public void setPassword (String value) {
+            this.password = value;
+        }
+        
+  
                     
         
         public void initWithDefaults() {

tests/src/pokerth_protocol/PlayerIdChangedMessage.java

@@ -0,0 +1,111 @@
+
+package pokerth_protocol;
+//
+// This file was generated by the BinaryNotes compiler.
+// See http://bnotes.sourceforge.net 
+// Any modifications to this file will be lost upon recompilation of the source ASN.1. 
+//
+
+import org.bn.*;
+import org.bn.annotations.*;
+import org.bn.annotations.constraints.*;
+import org.bn.coders.*;
+import org.bn.types.*;
+
+
+
+
+    @ASN1PreparedElement
+    @ASN1BoxedType ( name = "PlayerIdChangedMessage" )
+    public class PlayerIdChangedMessage implements IASN1PreparedElement {
+                
+        
+
+       @ASN1PreparedElement
+       @ASN1Sequence ( name = "PlayerIdChangedMessage" , isSet = false )
+       public static class PlayerIdChangedMessageSequenceType implements IASN1PreparedElement {
+                
+        @ASN1Element ( name = "oldPlayerId", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private NonZeroId oldPlayerId = null;
+                
+  
+        @ASN1Element ( name = "newPlayerId", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private NonZeroId newPlayerId = null;
+                
+  
+        
+        public NonZeroId getOldPlayerId () {
+            return this.oldPlayerId;
+        }
+
+        
+
+        public void setOldPlayerId (NonZeroId value) {
+            this.oldPlayerId = value;
+        }
+        
+  
+        
+        public NonZeroId getNewPlayerId () {
+            return this.newPlayerId;
+        }
+
+        
+
+        public void setNewPlayerId (NonZeroId value) {
+            this.newPlayerId = value;
+        }
+        
+  
+                
+                
+        public void initWithDefaults() {
+            
+        }
+
+        public IASN1PreparedElementData getPreparedData() {
+            return preparedData_PlayerIdChangedMessageSequenceType;
+        }
+
+       private static IASN1PreparedElementData preparedData_PlayerIdChangedMessageSequenceType = CoderFactory.getInstance().newPreparedElementData(PlayerIdChangedMessageSequenceType.class);
+                
+       }
+
+       
+                
+        @ASN1Element ( name = "PlayerIdChangedMessage", isOptional =  false , hasTag =  true, tag = 36, 
+        tagClass =  TagClass.Application  , hasDefaultValue =  false  )
+    
+        private PlayerIdChangedMessageSequenceType  value;        
+
+        
+        
+        public PlayerIdChangedMessage () {
+        }
+        
+        
+        
+        public void setValue(PlayerIdChangedMessageSequenceType value) {
+            this.value = value;
+        }
+        
+        
+        
+        public PlayerIdChangedMessageSequenceType getValue() {
+            return this.value;
+        }            
+        
+
+	    public void initWithDefaults() {
+	    }
+
+        private static IASN1PreparedElementData preparedData = CoderFactory.getInstance().newPreparedElementData(PlayerIdChangedMessage.class);
+        public IASN1PreparedElementData getPreparedData() {
+            return preparedData;
+        }
+
+            
+    }
+            

tests/src/pokerth_protocol/PokerTHMessage.java

@@ -199,6 +199,11 @@ import org.bn.types.*;
 	private EndOfGameMessage endOfGameMessage = null;
                 
   
+        @ASN1Element ( name = "playerIdChangedMessage", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
+    
+	private PlayerIdChangedMessage playerIdChangedMessage = null;
+                
+  
         @ASN1Element ( name = "askKickPlayerMessage", isOptional =  false , hasTag =  false  , hasDefaultValue =  false  )
     
 	private AskKickPlayerMessage askKickPlayerMessage = null;
@@ -376,6 +381,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -503,6 +510,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -630,6 +639,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -757,6 +768,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -884,6 +897,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1011,6 +1026,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1138,6 +1155,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1265,6 +1284,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1392,6 +1413,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1519,6 +1542,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1646,6 +1671,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1773,6 +1800,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -1900,6 +1929,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2027,6 +2058,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2154,6 +2187,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2281,6 +2316,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2408,6 +2445,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2535,6 +2574,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2662,6 +2703,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2789,6 +2832,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -2916,6 +2961,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3043,6 +3090,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3170,6 +3219,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3297,6 +3348,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3424,6 +3477,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3551,6 +3606,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3678,6 +3735,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3805,6 +3864,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -3932,6 +3993,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4059,6 +4122,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4186,6 +4251,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4313,6 +4380,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4440,6 +4509,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4567,6 +4638,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4694,6 +4767,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4821,6 +4896,137 @@ import org.bn.types.*;
                 
                     setAfterHandShowCardsMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
+                    setAskKickPlayerMessage(null);
+                
+                    setAskKickDeniedMessage(null);
+                
+                    setStartKickPetitionMessage(null);
+                
+                    setVoteKickRequestMessage(null);
+                
+                    setVoteKickReplyMessage(null);
+                
+                    setKickPetitionUpdateMessage(null);
+                
+                    setEndKickPetitionMessage(null);
+                
+                    setStatisticsMessage(null);
+                
+                    setChatRequestMessage(null);
+                
+                    setChatMessage(null);
+                
+                    setChatRejectMessage(null);
+                
+                    setDialogMessage(null);
+                
+                    setTimeoutWarningMessage(null);
+                
+                    setResetTimeoutMessage(null);
+                
+                    setAfkWarningMessage(null);
+                
+                    setReportAvatarMessage(null);
+                
+                    setReportAvatarAckMessage(null);
+                
+                    setErrorMessage(null);
+                            
+        }
+
+        
+  
+        
+        public PlayerIdChangedMessage getPlayerIdChangedMessage () {
+            return this.playerIdChangedMessage;
+        }
+
+        public boolean isPlayerIdChangedMessageSelected () {
+            return this.playerIdChangedMessage != null;
+        }
+
+        private void setPlayerIdChangedMessage (PlayerIdChangedMessage value) {
+            this.playerIdChangedMessage = value;
+        }
+
+        
+        public void selectPlayerIdChangedMessage (PlayerIdChangedMessage value) {
+            this.playerIdChangedMessage = value;
+            
+                    setAnnounceMessage(null);
+                
+                    setInitMessage(null);
+                
+                    setAuthMessage(null);
+                
+                    setInitAckMessage(null);
+                
+                    setAvatarRequestMessage(null);
+                
+                    setAvatarReplyMessage(null);
+                
+                    setPlayerListMessage(null);
+                
+                    setGameListMessage(null);
+                
+                    setPlayerInfoRequestMessage(null);
+                
+                    setPlayerInfoReplyMessage(null);
+                
+                    setSubscriptionRequestMessage(null);
+                
+                    setJoinGameRequestMessage(null);
+                
+                    setJoinGameReplyMessage(null);
+                
+                    setGamePlayerMessage(null);
+                
+                    setKickPlayerRequestMessage(null);
+                
+                    setLeaveGameRequestMessage(null);
+                
+                    setInvitePlayerToGameMessage(null);
+                
+                    setInviteNotifyMessage(null);
+                
+                    setRejectGameInvitationMessage(null);
+                
+                    setRejectInvNotifyMessage(null);
+                
+                    setStartEventMessage(null);
+                
+                    setStartEventAckMessage(null);
+                
+                    setGameStartMessage(null);
+                
+                    setHandStartMessage(null);
+                
+                    setPlayersTurnMessage(null);
+                
+                    setMyActionRequestMessage(null);
+                
+                    setYourActionRejectedMessage(null);
+                
+                    setPlayersActionDoneMessage(null);
+                
+                    setDealFlopCardsMessage(null);
+                
+                    setDealTurnCardMessage(null);
+                
+                    setDealRiverCardMessage(null);
+                
+                    setAllInShowCardsMessage(null);
+                
+                    setEndOfHandMessage(null);
+                
+                    setShowMyCardsRequestMessage(null);
+                
+                    setAfterHandShowCardsMessage(null);
+                
+                    setEndOfGameMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -4950,6 +5156,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickDeniedMessage(null);
                 
                     setStartKickPetitionMessage(null);
@@ -5077,6 +5285,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setStartKickPetitionMessage(null);
@@ -5204,6 +5414,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5331,6 +5543,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5458,6 +5672,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5585,6 +5801,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5712,6 +5930,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5839,6 +6059,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -5966,6 +6188,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6093,6 +6317,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6220,6 +6446,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6347,6 +6575,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6474,6 +6704,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6601,6 +6833,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6728,6 +6962,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6855,6 +7091,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -6982,6 +7220,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);
@@ -7109,6 +7349,8 @@ import org.bn.types.*;
                 
                     setEndOfGameMessage(null);
                 
+                    setPlayerIdChangedMessage(null);
+                
                     setAskKickPlayerMessage(null);
                 
                     setAskKickDeniedMessage(null);

tests/src/pokerth_test/TestBase.java

@@ -251,13 +251,13 @@ public abstract class TestBase {
 		gameInfo.setProposedGuiSpeed(guiSpeed);
 		JoinNewGame joinNew = new JoinNewGame();
 		joinNew.setGameInfo(gameInfo);
+		if (!password.isEmpty()) {
+			joinNew.setPassword(password);
+		}
 		JoinGameActionChoiceType joinAction = new JoinGameActionChoiceType();
 		joinAction.selectJoinNewGame(joinNew);
 		JoinGameRequestMessageSequenceType joinType = new JoinGameRequestMessageSequenceType();
 		joinType.setJoinGameAction(joinAction);
-		if (!password.isEmpty()) {
-			joinType.setPassword(password);
-		}
 		joinType.setAutoLeave(autoLeave);
 		JoinGameRequestMessage joinRequest = new JoinGameRequestMessage();
 		joinRequest.setValue(joinType);
@@ -270,13 +270,13 @@ public abstract class TestBase {
 	public PokerTHMessage joinGameRequestMsg(long gameId, String password, boolean autoLeave) {
 		JoinExistingGame joinExisting = new JoinExistingGame();
 		joinExisting.setGameId(new NonZeroId(gameId));
+		if (!password.isEmpty()) {
+			joinExisting.setPassword(password);
+		}
 		JoinGameActionChoiceType joinAction = new JoinGameActionChoiceType();
 		joinAction.selectJoinExistingGame(joinExisting);
 		JoinGameRequestMessageSequenceType joinType = new JoinGameRequestMessageSequenceType();
 		joinType.setJoinGameAction(joinAction);
-		if (!password.isEmpty()) {
-			joinType.setPassword(password);
-		}
 		joinType.setAutoLeave(autoLeave);
 
 		JoinGameRequestMessage joinRequest = new JoinGameRequestMessage();