[Arianne-commits] marauroa/src/marauroa/server/game GameServerManager.java, 1.35, 1.36 Statistics.java, 1.16, 1.17

[Miguel A. B. L. <ari...@us...>]

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv15710/server/game

Modified Files:
	GameServerManager.java Statistics.java 
Log Message:
Completed database migration to 2.0
Be happy! The day is near!

Index: Statistics.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/Statistics.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Statistics.java	18 Jan 2007 12:58:07 -0000	1.16
--- Statistics.java	3 Feb 2007 17:33:40 -0000	1.17
***************
*** 23,28 ****
  import marauroa.common.Configuration;
  import marauroa.common.Log4J;
! import marauroa.server.game.db.JDBCPlayerDatabase;
! import marauroa.server.game.db.Transaction;
  
  import org.apache.log4j.Logger;
--- 23,28 ----
  import marauroa.common.Configuration;
  import marauroa.common.Log4J;
! import marauroa.server.game.db.JDBCTransaction;
! import marauroa.server.game.db.nio.JDBCDatabase;
  
  import org.apache.log4j.Logger;
***************
*** 151,157 ****
  				lastStatisticsEventAdded = actualTime;
  
! 				JDBCPlayerDatabase database = (JDBCPlayerDatabase) JDBCPlayerDatabase
! 						.getDatabase();
! 				Transaction transaction = database.getTransaction();
  
  				database.addStatisticsEvent(transaction, now);
--- 151,156 ----
  				lastStatisticsEventAdded = actualTime;
  
! 				JDBCDatabase database = JDBCDatabase.getDatabase();
! 				JDBCTransaction transaction = database.getTransaction();
  
  				database.addStatisticsEvent(transaction, now);

Index: GameServerManager.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/GameServerManager.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** GameServerManager.java	28 Jan 2007 20:22:16 -0000	1.35
--- GameServerManager.java	3 Feb 2007 17:33:40 -0000	1.36
***************
*** 630,634 ****
  
  			/* Build player character list and send it to client */
! 			String[] characters = entry.getCharacters();
  			MessageS2CCharacterList msgCharacters = new MessageS2CCharacterList(msg.getSocketChannel(), characters);
  			msgCharacters.setClientID(clientid);
--- 630,634 ----
  
  			/* Build player character list and send it to client */
! 			String[] characters = entry.getCharacters().toArray(new String[0]);
  			MessageS2CCharacterList msgCharacters = new MessageS2CCharacterList(msg.getSocketChannel(), characters);
  			msgCharacters.setClientID(clientid);