[Arianne-commits] marauroa/src/marauroa/server/game GameServerManager.java, 1.121, 1.122

[Hendrik <nh...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv20895/src/marauroa/server/game

Modified Files:
	GameServerManager.java 
Log Message:
prepared release of Marauroa 3.1

Index: GameServerManager.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/GameServerManager.java,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** GameServerManager.java	22 Aug 2009 07:45:27 -0000	1.121
--- GameServerManager.java	1 Sep 2009 19:14:18 -0000	1.122
***************
*** 38,41 ****
--- 38,42 ----
  import marauroa.common.net.message.MessageC2SLoginRequestKey;
  import marauroa.common.net.message.MessageC2SLoginSendNonceNameAndPassword;
+ import marauroa.common.net.message.MessageC2SLoginSendNonceNamePasswordAndSeed;
  import marauroa.common.net.message.MessageC2SLoginSendPromise;
  import marauroa.common.net.message.MessageC2SLogout;
***************
*** 1020,1025 ****
  	private void processSecuredLoginEvent(Message msg) {
  		try {
- 			MessageC2SLoginSendNonceNameAndPassword msgLogin = (MessageC2SLoginSendNonceNameAndPassword) msg;
- 
  			int clientid = msg.getClientID();
  			PlayerEntry entry = playerContainer.get(clientid);
--- 1021,1024 ----
***************
*** 1032,1039 ****
  			SecuredLoginInfo info = entry.loginInformations;
  
! 			info.clientNonce = msgLogin.getHash();
! 			info.username = msgLogin.getUsername();
! 			info.password = msgLogin.getPassword();
! 
  
  			/*
--- 1031,1045 ----
  			SecuredLoginInfo info = entry.loginInformations;
  
! 			if (msg instanceof MessageC2SLoginSendNonceNameAndPassword) {
! 				MessageC2SLoginSendNonceNameAndPassword msgLogin = (MessageC2SLoginSendNonceNameAndPassword) msg;
! 				info.clientNonce = msgLogin.getHash();
! 				info.username = msgLogin.getUsername();
! 				info.password = msgLogin.getPassword();
! 			} else {
! 				MessageC2SLoginSendNonceNamePasswordAndSeed msgLogin = (MessageC2SLoginSendNonceNamePasswordAndSeed) msg;
! 				info.clientNonce = msgLogin.getHash();
! 				info.username = msgLogin.getUsername();
! 				info.password = msgLogin.getPassword();
! 			}
  
  			/*
***************
*** 1101,1105 ****
  			
  			/* Now we check if this player is previously logged in */
! 			PlayerEntry existing = playerContainer.get(msgLogin.getUsername());
  
  			if (existing != null) {
--- 1107,1111 ----
  			
  			/* Now we check if this player is previously logged in */
! 			PlayerEntry existing = playerContainer.get(info.username);
  
  			if (existing != null) {