Arianne RPG

Update of /cvsroot/arianne/stendhal_website
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17463

Modified Files:
	.cvsignore 
Log Message:
add .buildpath to .cvsignore

Index: .cvsignore
===================================================================
RCS file: /cvsroot/arianne/stendhal_website/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** .cvsignore	4 Apr 2010 15:54:10 -0000	1.9
--- .cvsignore	3 May 2010 22:10:14 -0000	1.10
***************
*** 13,15 ****
  w
  googlebac*.html
! robots.txt
\ No newline at end of file
--- 13,16 ----
  w
  googlebac*.html
! robots.txt
! .buildpath

Update of /cvsroot/arianne/stendhal_website
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17247

Modified Files:
	index_beta.php 
Log Message:
java 1.5 is okay

Index: index_beta.php
===================================================================
RCS file: /cvsroot/arianne/stendhal_website/index_beta.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** index_beta.php	2 May 2010 21:56:24 -0000	1.18
--- index_beta.php	3 May 2010 22:09:50 -0000	1.19
***************
*** 170,174 ****
  		<script src="/css/00000001.js"></script>
  
! 		<a href="#" onclick='javascript:webstart("1.6.0", "http://arianne.sourceforge.net/jws/stendhal.jnlp"); return false'><span class="block" id="playArea"></span></a>
  		<a href="http://downloads.sourceforge.net/arianne/stendhal-FULL-<?php echo STENDHAL_VERSION; ?>.zip"><span class="block" id="downloadArea"></span></a>
  
--- 170,174 ----
  		<script src="/css/00000001.js"></script>
  
! 		<a href="#" onclick='javascript:webstart("1.5.0", "http://arianne.sourceforge.net/jws/stendhal.jnlp"); return false'><span class="block" id="playArea"></span></a>
  		<a href="http://downloads.sourceforge.net/arianne/stendhal-FULL-<?php echo STENDHAL_VERSION; ?>.zip"><span class="block" id="downloadArea"></span></a>

Update of /cvsroot/arianne/stendhal_website/css
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17181/css

Modified Files:
	00000001.js 
Log Message:
improved readability

Index: 00000001.js
===================================================================
RCS file: /cvsroot/arianne/stendhal_website/css/00000001.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 00000001.js	2 May 2010 21:56:24 -0000	1.2
--- 00000001.js	3 May 2010 22:09:36 -0000	1.3
***************
*** 5,12 ****
  	if (!deployJava.isWebStartInstalled(minimumVersion)) {
  		if (deployJava.installLatestJRE()) {
! 			if (deployJava.launch(jnlp)) {}
  		}
  	} else {
! 		if (deployJava.launch(jnlp)) {}
  	};
  }
--- 5,12 ----
  	if (!deployJava.isWebStartInstalled(minimumVersion)) {
  		if (deployJava.installLatestJRE()) {
! 			deployJava.launch(jnlp);
  		}
  	} else {
! 		deployJava.launch(jnlp);
  	};
  }

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv17029/src/marauroa/server/game/db

Modified Files:
	AccountDAO.java 
Log Message:
check login seeds

Index: AccountDAO.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/AccountDAO.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AccountDAO.java	3 May 2010 21:21:35 -0000	1.20
--- AccountDAO.java	3 May 2010 22:08:45 -0000	1.21
***************
*** 367,370 ****
--- 367,385 ----
  		}
  
+ 		// if a login seed was provided, check it
+ 		if (informations.seed != null) {
+ 			LoginSeedDAO loginSeedDAO = DAORegister.get().get(LoginSeedDAO.class);
+ 			Boolean seedVerified = loginSeedDAO.verifySeed(transaction, informations.username, informations.seed);
+ 			if (seedVerified == null) {
+ 				return false;
+ 			}
+ 			// the provided see is valid, use it up
+ 			loginSeedDAO.useSeed(informations.seed);
+ 			if (seedVerified == Boolean.TRUE) {
+ 				// the seed was even pre authenticated, so we are done here
+ 				return true;
+ 			}
+ 		}
+ 
  		byte[] b1 = informations.key.decodeByteArray(informations.password);
  		byte[] b2 = Hash.xor(informations.clientNonce, informations.serverNonce);

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv16991/src/marauroa/server/game/db

Modified Files:
	LoginSeedDAO.java 
Log Message:
seeds are only good for one login

Index: LoginSeedDAO.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/LoginSeedDAO.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LoginSeedDAO.java	3 May 2010 21:20:48 -0000	1.1
--- LoginSeedDAO.java	3 May 2010 22:08:35 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
  	 * Blocking ip-addresses is not related to banning ip-addresses.
  	 *
+ 	 * @param transaction DBTransaction
  	 * @param username username
  	 * @param seed seed
***************
*** 50,54 ****
  	 */
  	public Boolean verifySeed(DBTransaction transaction, String username, String seed) throws SQLException {
! 		String query = "SELECT complete FROM account, loginseed WHERE account.id=loginseed.player_id AND loginseed.seed='[seed]' AND account.username='[username]'";
  		Map<String, Object> params = new HashMap<String, Object>();
  		params.put("seed", seed);
--- 51,57 ----
  	 */
  	public Boolean verifySeed(DBTransaction transaction, String username, String seed) throws SQLException {
! 		String query = "SELECT complete FROM account, loginseed " +
! 				"WHERE account.id=loginseed.player_id AND loginseed.seed='[seed]' AND account.username='[username]' " +
! 				"AND loginseed.used = 0";
  		Map<String, Object> params = new HashMap<String, Object>();
  		params.put("seed", seed);
***************
*** 60,64 ****
  			return null;
  		}
! 		return resultSet.getBoolean("complete");
  	}
  
--- 63,86 ----
  			return null;
  		}
! 		if (resultSet.getInt("complete") == 1) {
! 			return Boolean.TRUE;
! 		}
! 		return Boolean.FALSE;
! 	}
! 
! 
! 	/**
! 	 * marks a seed as used
! 	 *
! 	 * @param transaction DBTransaction
! 	 * @param seed seed
! 	 * @throws SQLException in case of an database error
! 	 */
! 	public void useSeed(DBTransaction transaction, String seed) throws SQLException {
! 		String query = "UPDATE loginseed SET used = 1 WHERE seed='[seed]'";
! 		Map<String, Object> params = new HashMap<String, Object>();
! 		params.put("seed", seed);
! 		logger.debug("useSeed is executing query " + query);
! 		transaction.execute(query, params);
  	}
  
***************
*** 84,86 ****
--- 106,124 ----
  	}
  
+ 
+ 	/**
+ 	 * marks a seed as used
+ 	 *
+ 	 * @param seed seed
+ 	 * @throws SQLException in case of an database error
+ 	 */
+ 	public void useSeed(String seed) throws SQLException {
+ 		DBTransaction transaction = TransactionPool.get().beginWork();
+ 		try {
+ 			useSeed(transaction, seed);
+ 		} finally {
+ 			TransactionPool.get().commit(transaction);
+ 		}
+ 	}
+ 
  }

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/kalavan/castle
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14693/src/games/stendhal/server/maps/kalavan/castle

Modified Files:
	SadScientsBrother.java 
Log Message:
added parameter quest index to ItemGuardCrerature instance

Index: SadScientsBrother.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/kalavan/castle/SadScientsBrother.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SadScientsBrother.java	27 Mar 2010 13:46:18 -0000	1.4
--- SadScientsBrother.java	3 May 2010 21:53:53 -0000	1.5
***************
*** 16,20 ****
  			Map<String, String> attributes) {
  		final EntityManager manager = SingletonRepository.getEntityManager();
! 		final Creature creature = new ItemGuardCreature(manager.getCreature("imperial scientist"), "goblet", "sad_scientist", "kill_scientist");
  		creature.setName("Sergej Elos");
  		final CreatureRespawnPoint point = new CreatureRespawnPoint(zone, 43, 85, creature, 1);
--- 16,20 ----
  			Map<String, String> attributes) {
  		final EntityManager manager = SingletonRepository.getEntityManager();
! 		final Creature creature = new ItemGuardCreature(manager.getCreature("imperial scientist"), "goblet", "sad_scientist", "kill_scientist", 0);
  		creature.setName("Sergej Elos");
  		final CreatureRespawnPoint point = new CreatureRespawnPoint(zone, 43, 85, creature, 1);

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/creature
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13889/src/games/stendhal/server/entity/creature

Modified Files:
	ItemGuardCreature.java 
Log Message:
added constructor for using extra parameter for quest index

Index: ItemGuardCreature.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/creature/ItemGuardCreature.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** ItemGuardCreature.java	27 Mar 2010 13:46:18 -0000	1.26
--- ItemGuardCreature.java	3 May 2010 21:49:03 -0000	1.27
***************
*** 39,42 ****
--- 39,44 ----
  	
  	private final String questState;
+ 	
+ 	private final int questIndex;
  
  	/**                             
***************
*** 48,54 ****
  	 */
  	public ItemGuardCreature(final Creature copy, final String itemType) {
! 		this(copy, itemType, null, null);
  	}
! 	
  	/**
  	 * Creates an ItemGuardCreature.
--- 50,56 ----
  	 */
  	public ItemGuardCreature(final Creature copy, final String itemType) {
! 		this(copy, itemType, null, null, 0);
  	}
! 
  	/**
  	 * Creates an ItemGuardCreature.
***************
*** 64,67 ****
--- 66,86 ----
  	 */
  	public ItemGuardCreature(final Creature copy, final String itemType, final String questSlot, final String questState) {
+ 		this(copy, itemType, questSlot, questState, 0);
+ 	}
+ 	
+ 	
+ 	/**
+ 	 * Creates an ItemGuardCreature.
+ 	 * 
+ 	 * @param copy
+ 	 *            base creature
+ 	 * @param itemType
+ 	 *            the quest item to drop on death
+ 	 * @param questSlot
+ 	 *            the quest slot for the active quest
+ 	 * @param questState
+ 	 * 			  the state of the quest to check on dead for
+ 	 */
+ 	public ItemGuardCreature(final Creature copy, final String itemType, final String questSlot, final String questState, final int questIndex) {
  		super(copy);
  
***************
*** 69,72 ****
--- 88,92 ----
  		this.questSlot = questSlot;
  		this.questState = questState;
+ 		this.questIndex = questIndex;
  
  		noises = new LinkedHashMap<String, LinkedList<String>>(noises);
***************
*** 86,90 ****
  	@Override
  	public Creature getNewInstance() {
! 		return new ItemGuardCreature(this, itemType, questSlot, questState);
  	}
  
--- 106,110 ----
  	@Override
  	public Creature getNewInstance() {
! 		return new ItemGuardCreature(this, itemType, questSlot, questState, questIndex);
  	}
  
***************
*** 96,100 ****
  			if (!killerPlayer.isEquipped(itemType) && !killerPlayer.isQuestCompleted(questSlot)) {
  				if(questState != null) {
! 					if (killerPlayer.isQuestInState(questSlot,questState)) {
  						equipPlayerWithGuardedItem(killerPlayer);
  					}
--- 116,120 ----
  			if (!killerPlayer.isEquipped(itemType) && !killerPlayer.isQuestCompleted(questSlot)) {
  				if(questState != null) {
! 					if (killerPlayer.isQuestInState(questSlot, questIndex, questState)) {
  						equipPlayerWithGuardedItem(killerPlayer);
  					}

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13296/src/games/stendhal/server/entity/player

Modified Files:
	PlayerQuests.java Player.java 
Log Message:
added method for check certain quest index state

Index: Player.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/Player.java,v
retrieving revision 1.270
retrieving revision 1.271
diff -C2 -d -r1.270 -r1.271
*** Player.java	29 Apr 2010 20:07:39 -0000	1.270
--- Player.java	3 May 2010 21:46:26 -0000	1.271
***************
*** 1149,1152 ****
--- 1149,1167 ----
  		return quests.isQuestInState(name, states);
  	}
+ 	
+ 	/**
+ 	 * Is the named quest in one of the listed states?
+ 	 * 
+ 	 * @param name
+ 	 *            quest
+ 	 * @param index           
+ 	 *            quest index
+ 	 * @param states
+ 	 *            valid states
+ 	 * @return true, if the quest is in one of theses states, false otherwise
+ 	 */
+ 	public boolean isQuestInState(final String name, final int index, final String... states) {
+ 		return quests.isQuestInState(name, index, states);
+ 	}
  
  	/**

Index: PlayerQuests.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/player/PlayerQuests.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PlayerQuests.java	21 Dec 2009 10:27:30 -0000	1.9
--- PlayerQuests.java	3 May 2010 21:46:26 -0000	1.10
***************
*** 185,188 ****
--- 185,213 ----
  		return false;
  	}
+ 	
+ 	/**
+ 	 * Is the named quest in one of the listed states?
+ 	 * 
+ 	 * @param name
+ 	 *            quest
+ 	 * @param index         
+ 	 *            quest index
+ 	 * @param states
+ 	 *            valid states
+ 	 * @return true, if the quest is in one of theses states, false otherwise
+ 	 */
+ 	public boolean isQuestInState(final String name, final int index, final String... states) {
+ 		final String questState = getQuest(name, index);
+ 
+ 		if (questState != null) {
+ 			for (final String state : states) {
+ 				if (questState.equals(state)) {
+ 					return true;
+ 				}
+ 			}
+ 		}
+ 
+ 		return false;
+ 	}
  
  }

Update of /cvsroot/arianne/stendhal/libs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11964/libs

Modified Files:
	marauroa.jar 
Log Message:
updated marauroa

Index: marauroa.jar
===================================================================
RCS file: /cvsroot/arianne/stendhal/libs/marauroa.jar,v
retrieving revision 1.86
retrieving revision 1.87
diff -C2 -d -r1.86 -r1.87
Binary files /tmp/cvsGmGchT and /tmp/cvsV5hwQE differ

Update of /cvsroot/arianne/marauroa/src/marauroa/server
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11458/src/marauroa/server

Modified Files:
	marauroa_init.sql 
Log Message:
added used column to loginseed

Index: marauroa_init.sql
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/marauroa_init.sql,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** marauroa_init.sql	3 May 2010 21:14:35 -0000	1.36
--- marauroa_init.sql	3 May 2010 21:35:44 -0000	1.37
***************
*** 122,126 ****
    seed varchar(120),
    address varchar(64),
!   complete int,
    timedate timestamp default CURRENT_TIMESTAMP,
    primary key(id)
--- 122,127 ----
    seed varchar(120),
    address varchar(64),
!   complete integer,
!   used integer,
    timedate timestamp default CURRENT_TIMESTAMP,
    primary key(id)

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9542/src/marauroa/server/game/db

Modified Files:
	DAORegister.java 
Log Message:
added new LoginSeedDAO to DAORegister

Index: DAORegister.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/DAORegister.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DAORegister.java	27 Dec 2009 15:41:33 -0000	1.6
--- DAORegister.java	3 May 2010 21:23:27 -0000	1.7
***************
*** 87,90 ****
--- 87,91 ----
  		register(GameEventDAO.class, new GameEventDAO());
  		register(LoginEventDAO.class, new LoginEventDAO());
+ 		register(LoginSeedDAO.class, new LoginSeedDAO());
  		register(RPObjectDAO.class, new RPObjectDAO(factory));
  		register(RPZoneDAO.class, new RPZoneDAO(factory));

Update of /cvsroot/arianne/stendhal/libs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9281/libs

Modified Files:
	marauroa.jar 
Log Message:
updated marauroa

Index: marauroa.jar
===================================================================
RCS file: /cvsroot/arianne/stendhal/libs/marauroa.jar,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
Binary files /tmp/cvsN4D6SD and /tmp/cvsaGWLNH differ

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9222/src/marauroa/server/game/db

Modified Files:
	AccountDAO.java 
Log Message:
fixed comment

Index: AccountDAO.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/db/AccountDAO.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AccountDAO.java	22 Mar 2010 17:48:47 -0000	1.19
--- AccountDAO.java	3 May 2010 21:21:35 -0000	1.20
***************
*** 385,389 ****
  
  		if (!res) {
! 			// compatibility: check new Marauroa 1.0 password type
  			hexPassword = Hash.toHexString(Hash.hash(password));
  			res = verifyUsingDB(transaction, informations.username, hexPassword);
--- 385,389 ----
  
  		if (!res) {
! 			// compatibility: check old Marauroa 1.0 password type
  			hexPassword = Hash.toHexString(Hash.hash(password));
  			res = verifyUsingDB(transaction, informations.username, hexPassword);

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game/db
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9040/src/marauroa/server/game/db

Added Files:
	LoginSeedDAO.java 
Log Message:
implemented LoginSeedDAO

--- NEW FILE: LoginSeedDAO.java ---
/* $Id: LoginSeedDAO.java,v 1.1 2010/05/03 21:20:48 nhnb Exp $ */
/***************************************************************************
 *                   (C) Copyright 2003-2009 - Marauroa                    *
 ***************************************************************************
 ***************************************************************************
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
package marauroa.server.game.db;

import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.Map;

import marauroa.common.Log4J;
import marauroa.server.db.DBTransaction;
import marauroa.server.db.TransactionPool;

/**
 * data access object for login seeds
 *
 * @author hendrik
 */
public class LoginSeedDAO {
	private static final marauroa.common.Logger logger = Log4J.getLogger(LoginSeedDAO.class);

	/**
	 * Creates a new LoginSeedDAO
	 */
	protected LoginSeedDAO() {
		// hide constructor as this class should only be instantiated by DAORegister
	}


	/**
	 * checks if the ip-address is temporary blocked because of too many failed login attempts.
	 * Blocking ip-addresses is not related to banning ip-addresses.
	 *
	 * @param username username
	 * @param seed seed
	 * @return <code>true</code>, if this seed is already authenticated;
	 *    <code>false<code>, if the seed exists but is not authenticated
	 *    <code>null</code>, if the seed does not exist at all
	 * @throws SQLException in case of an database error
	 */
	public Boolean verifySeed(DBTransaction transaction, String username, String seed) throws SQLException {
		String query = "SELECT complete FROM account, loginseed WHERE account.id=loginseed.player_id AND loginseed.seed='[seed]' AND account.username='[username]'";
		Map<String, Object> params = new HashMap<String, Object>();
		params.put("seed", seed);
		params.put("username", username);
		logger.debug("verifySeed is executing query " + query);
		ResultSet resultSet = transaction.query(query, params);

		if (!resultSet.next()) {
			return null;
		}
		return resultSet.getBoolean("complete");
	}


	/**
	 * checks if the ip-address is temporary blocked because of too many failed login attempts.
	 * Blocking ip-addresses is not related to banning ip-addresses.
	 *
	 * @param username username
	 * @param seed seed
	 * @return <code>true</code>, if this seed is already authenticated;
	 *    <code>false<code>, if the seed exists but is not authenticated
	 *    <code>null</code>, if the seed does not exist at all
	 * @throws SQLException in case of an database error
	 */
	public Boolean verifySeed(String username, String seed) throws SQLException {
		DBTransaction transaction = TransactionPool.get().beginWork();
		try {
			return verifySeed(transaction, username, seed);
		} finally {
			TransactionPool.get().commit(transaction);
		}
	}

}

Update of /cvsroot/arianne/marauroa/src/marauroa/server
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7921/src/marauroa/server

Modified Files:
	marauroa_init.sql 
Log Message:
added index on loginseed(player_id)

Index: marauroa_init.sql
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/marauroa_init.sql,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** marauroa_init.sql	3 May 2010 21:11:11 -0000	1.35
--- marauroa_init.sql	3 May 2010 21:14:35 -0000	1.36
***************
*** 127,131 ****
    );
  
! /* create unique index i_loginseed on loginseed(seed); */
  
  create table if not exists banlist
--- 127,132 ----
    );
  
! /*create unique index i_loginseed on loginseed(seed); */
! /*create index i_loginseed_player_id on loginseed(player_id);*/
  
  create table if not exists banlist

Update of /cvsroot/arianne/marauroa/src/marauroa/server
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv7260/src/marauroa/server

Modified Files:
	marauroa_init.sql 
Log Message:
added player_id to loginseed

Index: marauroa_init.sql
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/marauroa_init.sql,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** marauroa_init.sql	3 May 2010 20:48:37 -0000	1.34
--- marauroa_init.sql	3 May 2010 21:11:11 -0000	1.35
***************
*** 119,122 ****
--- 119,123 ----
    (
    id integer auto_increment not null,
+   player_id integer,
    seed varchar(120),
    address varchar(64),

Update of /cvsroot/arianne/stendhal/src/games/stendhal/client/sprite
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv5456/src/games/stendhal/client/sprite

Modified Files:
	SpriteStore.java 
Log Message:
removed unused variable


Index: SpriteStore.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/client/sprite/SpriteStore.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SpriteStore.java	3 Mar 2010 23:07:08 -0000	1.25
--- SpriteStore.java	3 May 2010 21:03:10 -0000	1.26
***************
*** 47,52 ****
  	protected GraphicsConfiguration gc;
  
- 	private static boolean doOldBootstrapClassloaderWorkaroundFirst = true;
- 
  	protected SpriteStore() {
  		try {
--- 47,50 ----

Update of /cvsroot/arianne/marauroa/src/marauroa/server
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2817/src/marauroa/server

Modified Files:
	marauroa_init.sql 
Log Message:
renamed table seed to loginseed

Index: marauroa_init.sql
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/marauroa_init.sql,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** marauroa_init.sql	3 May 2010 19:00:08 -0000	1.33
--- marauroa_init.sql	3 May 2010 20:48:37 -0000	1.34
***************
*** 116,120 ****
  /*create index i_gameEvents_param2 ON gameEvents(param2);*/
  
! create table if not exists seed
    (
    id integer auto_increment not null,
--- 116,120 ----
  /*create index i_gameEvents_param2 ON gameEvents(param2);*/
  
! create table if not exists loginseed
    (
    id integer auto_increment not null,
***************
*** 126,130 ****
    );
  
! /* create unique index i_seed on seed(seed); */
  
  create table if not exists banlist
--- 126,130 ----
    );
  
! /* create unique index i_loginseed on loginseed(seed); */
  
  create table if not exists banlist

Update of /cvsroot/arianne/stendhal/libs
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22189/libs

Modified Files:
	marauroa.jar 
Log Message:
updated marauroa

Index: marauroa.jar
===================================================================
RCS file: /cvsroot/arianne/stendhal/libs/marauroa.jar,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
Binary files /tmp/cvs2dnCGF and /tmp/cvs90qMTU differ

Update of /cvsroot/arianne/marauroa/src/marauroa/client
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21635/src/marauroa/client

Modified Files:
	ClientFramework.java 
Log Message:
encrypt the pre authentication seed just like the password is encrypted

Index: ClientFramework.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/client/ClientFramework.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** ClientFramework.java	3 May 2010 17:52:24 -0000	1.56
--- ClientFramework.java	3 May 2010 19:25:53 -0000	1.57
***************
*** 14,17 ****
--- 14,18 ----
  
  import java.io.IOException;
+ import java.io.UnsupportedEncodingException;
  import java.net.InetSocketAddress;
  import java.net.Proxy;
***************
*** 260,265 ****
  					byte[] cryptedPassword = key.encodeByteArray(b2);
  					if (seed != null) {
  						netMan.addMessage(new MessageC2SLoginSendNonceNamePasswordAndSeed(null,
! 					        clientNonce, username, cryptedPassword, seed));
  					} else {
  						netMan.addMessage(new MessageC2SLoginSendNonceNameAndPassword(null,
--- 261,276 ----
  					byte[] cryptedPassword = key.encodeByteArray(b2);
  					if (seed != null) {
+ 						byte[] b3 = null;
+ 						try {
+ 							b3 = Hash.xor(b1, seed.getBytes("UTF-8"));
+ 						} catch (UnsupportedEncodingException e) {
+ 							logger.error(e, e);
+ 						}
+ 						if (b3 == null) {
+ 							throw new LoginFailedException("Incorrect hash seed");
+ 						}
+ 						byte[] cryptedSeed = key.encodeByteArray(b3);
  						netMan.addMessage(new MessageC2SLoginSendNonceNamePasswordAndSeed(null,
! 					        clientNonce, username, cryptedPassword, cryptedSeed));
  					} else {
  						netMan.addMessage(new MessageC2SLoginSendNonceNameAndPassword(null,

Update of /cvsroot/arianne/marauroa/src/marauroa/server/game
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21635/src/marauroa/server/game

Modified Files:
	GameServerManager.java 
Log Message:
encrypt the pre authentication seed just like the password is encrypted

Index: GameServerManager.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/game/GameServerManager.java,v
retrieving revision 1.139
retrieving revision 1.140
diff -C2 -d -r1.139 -r1.140
*** GameServerManager.java	2 May 2010 17:01:54 -0000	1.139
--- GameServerManager.java	3 May 2010 19:25:52 -0000	1.140
***************
*** 14,17 ****
--- 14,18 ----
  
  import java.io.IOException;
+ import java.io.UnsupportedEncodingException;
  import java.nio.channels.SocketChannel;
  import java.sql.SQLException;
***************
*** 1070,1074 ****
  				info.username = msgLogin.getUsername();
  				info.password = msgLogin.getPassword();
! 				info.seed = msgLogin.getSeed();
  			}
  
--- 1071,1075 ----
  				info.username = msgLogin.getUsername();
  				info.password = msgLogin.getPassword();
! 				info.seed = decode(info, msgLogin.getSeed());
  			}
  
***************
*** 1230,1233 ****
--- 1231,1251 ----
  	}
  
+ 	private String decode(SecuredLoginInfo info, byte[] data) {
+ 		byte[] b1 = info.key.decodeByteArray(data);
+ 		byte[] b2 = Hash.xor(info.clientNonce, info.serverNonce);
+ 		if (b2 == null) {
+ 			logger.debug("B2 is null");
+ 			return null;
+ 		}
+ 
+ 		byte[] result = Hash.xor(b1, b2);
+ 		try {
+ 			return new String(result, "UTF-8");
+ 		} catch (UnsupportedEncodingException e) {
+ 			logger.error(e, e);
+ 			return null;
+ 		}
+ 	}
+ 
  	/**
  	 * This message is send from client to notify that client suffered a network

Update of /cvsroot/arianne/marauroa/src/marauroa/common/net/message
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21635/src/marauroa/common/net/message

Modified Files:
	MessageC2SLoginSendNonceNamePasswordAndSeed.java 
Log Message:
encrypt the pre authentication seed just like the password is encrypted

Index: MessageC2SLoginSendNonceNamePasswordAndSeed.java
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/common/net/message/MessageC2SLoginSendNonceNamePasswordAndSeed.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MessageC2SLoginSendNonceNamePasswordAndSeed.java	25 Feb 2010 20:58:18 -0000	1.4
--- MessageC2SLoginSendNonceNamePasswordAndSeed.java	3 May 2010 19:25:52 -0000	1.5
***************
*** 30,34 ****
  	private String username;
  	private byte[] password;
! 	private String seed;
  
  	/** Constructor for allowing creation of an empty message */
--- 30,34 ----
  	private String username;
  	private byte[] password;
! 	private byte[] seed;
  
  	/** Constructor for allowing creation of an empty message */
***************
*** 51,59 ****
  	 */
  	public MessageC2SLoginSendNonceNamePasswordAndSeed(SocketChannel source, byte[] nonce,
! 	        String username, byte[] password, String seed) {
  		super(MessageType.C2S_LOGIN_SENDNONCENAMEPASSWORDANDSEED, source, nonce);
  		this.username = username;
  		this.password = Utility.copy(password);
! 		this.seed = seed;
  	}
  
--- 51,59 ----
  	 */
  	public MessageC2SLoginSendNonceNamePasswordAndSeed(SocketChannel source, byte[] nonce,
! 	        String username, byte[] password, byte[] seed) {
  		super(MessageType.C2S_LOGIN_SENDNONCENAMEPASSWORDANDSEED, source, nonce);
  		this.username = username;
  		this.password = Utility.copy(password);
! 		this.seed = Utility.copy(seed);
  	}
  
***************
*** 81,85 ****
  	 * @return the seed
  	 */
! 	public String getSeed() {
  		return seed;
  	}
--- 81,85 ----
  	 * @return the seed
  	 */
! 	public byte[] getSeed() {
  		return seed;
  	}
***************
*** 93,97 ****
  		return "Message (C2S Login) from (" + getAddress() + ") CONTENTS: (nonce:"
  		        + Hash.toHexString(hash) + "\tusername:" + username + "\tpassword:"
! 		        + Hash.toHexString(password) + "\tseed:" + seed + ")";
  	}
  
--- 93,97 ----
  		return "Message (C2S Login) from (" + getAddress() + ") CONTENTS: (nonce:"
  		        + Hash.toHexString(hash) + "\tusername:" + username + "\tpassword:"
! 		        + Hash.toHexString(password) + "\tseed:" + Hash.toHexString(seed) + ")";
  	}
  
***************
*** 109,113 ****
  		username = in.readString();
  		password = in.readByteArray();
! 		seed = in.readString();
  		if (type != MessageType.C2S_LOGIN_SENDNONCENAMEPASSWORDANDSEED) {
  			throw new IOException();
--- 109,113 ----
  		username = in.readString();
  		password = in.readByteArray();
! 		seed = in.readByteArray();
  		if (type != MessageType.C2S_LOGIN_SENDNONCENAMEPASSWORDANDSEED) {
  			throw new IOException();

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/condition
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19827/src/games/stendhal/server/entity/npc/condition

Modified Files:
	KilledForQuestCondition.java 
Log Message:
fixed errors in parsing substring with kills numbers

Index: KilledForQuestCondition.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/condition/KilledForQuestCondition.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** KilledForQuestCondition.java	23 Apr 2010 22:41:59 -0000	1.2
--- KilledForQuestCondition.java	3 May 2010 19:06:45 -0000	1.3
***************
*** 54,58 ****
  		
  		for(int i=0; i<tokens.size()/5; i++) {
! 			final String creatureName=tokens.get(i);
  			int toKillSolo;
  			int toKillShared;
--- 54,58 ----
  		
  		for(int i=0; i<tokens.size()/5; i++) {
! 			final String creatureName=tokens.get(i*5);
  			int toKillSolo;
  			int toKillShared;
***************
*** 60,78 ****
  			int killedShared;
  			try {
! 				toKillSolo=Integer.parseInt(tokens.get(i+1));
! 				toKillShared=Integer.parseInt(tokens.get(i+2));
! 				killedSolo=Integer.parseInt(tokens.get(i+3));
! 				killedShared=Integer.parseInt(tokens.get(i+4));				
  			} catch (NumberFormatException npe) {
  				logger.error("NumberFormatException while parsing numbers in quest slot "+QUEST_SLOT+
  						" of player "+player.getName()
! 						+" , creature " + i);
  				return false;
  			};
  			final int diffSolo = player.getSoloKill(creatureName) - killedSolo - toKillSolo;
  			final int diffShared = player.getSharedKill(creatureName) - killedShared - toKillShared;
! 			if((diffSolo<0)||(diffShared<0)) {
  				return false;
! 			}
  		}
  		return true;
--- 60,83 ----
  			int killedShared;
  			try {
! 				toKillSolo=Integer.parseInt(tokens.get(i*5+1));
! 				toKillShared=Integer.parseInt(tokens.get(i*5+2));
! 				killedSolo=Integer.parseInt(tokens.get(i*5+3));
! 				killedShared=Integer.parseInt(tokens.get(i*5+4));				
  			} catch (NumberFormatException npe) {
  				logger.error("NumberFormatException while parsing numbers in quest slot "+QUEST_SLOT+
  						" of player "+player.getName()
! 						+" , creature " + i*5);
  				return false;
  			};
  			final int diffSolo = player.getSoloKill(creatureName) - killedSolo - toKillSolo;
  			final int diffShared = player.getSharedKill(creatureName) - killedShared - toKillShared;
! 			// if solo kills less then required, return false
! 			if(diffSolo<0) {
  				return false;
! 			};
! 			// if player killed solo less then required for shared, return false
! 			if((diffSolo+diffShared)<0) {
! 				return false;
! 			};
  		}
  		return true;
***************
*** 87,91 ****
  	public boolean equals(final Object obj) {
  		return EqualsBuilder.reflectionEquals(this, obj, false,
! 				KilledCondition.class);
  	}
  
--- 92,96 ----
  	public boolean equals(final Object obj) {
  		return EqualsBuilder.reflectionEquals(this, obj, false,
! 				KilledForQuestCondition.class);
  	}

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv19301/src/games/stendhal/server/entity/npc

Modified Files:
	ConversationPhrases.java 
Log Message:
added sentences for quests completion events 

Index: ConversationPhrases.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/entity/npc/ConversationPhrases.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ConversationPhrases.java	6 Nov 2009 23:59:57 -0000	1.17
--- ConversationPhrases.java	3 May 2010 19:02:55 -0000	1.18
***************
*** 28,32 ****
  	public static final List<String> QUEST_MESSAGES = Arrays.asList("task",
  			"quest", "favor", "favour");
! 
  	public static final List<String> OFFER_MESSAGES = Arrays.asList("offer",
  			"deal", "trade");
--- 28,35 ----
  	public static final List<String> QUEST_MESSAGES = Arrays.asList("task",
  			"quest", "favor", "favour");
! 	
! 	public static final List<String> FINISH_MESSAGES = Arrays.asList("done",
! 			"finish", "complete");
! 	
  	public static final List<String> OFFER_MESSAGES = Arrays.asList("offer",
  			"deal", "trade");

Update of /cvsroot/arianne/marauroa/src/marauroa/server
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv18771/src/marauroa/server

Modified Files:
	marauroa_init.sql 
Log Message:
compatibility with IPv6

Index: marauroa_init.sql
===================================================================
RCS file: /cvsroot/arianne/marauroa/src/marauroa/server/marauroa_init.sql,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** marauroa_init.sql	3 May 2010 18:56:19 -0000	1.32
--- marauroa_init.sql	3 May 2010 19:00:08 -0000	1.33
***************
*** 120,124 ****
    id integer auto_increment not null,
    seed varchar(120),
!   address varchar(15),
    complete int,
    timedate timestamp default CURRENT_TIMESTAMP,
--- 120,124 ----
    id integer auto_increment not null,
    seed varchar(120),
!   address varchar(64),
    complete int,
    timedate timestamp default CURRENT_TIMESTAMP,
***************
*** 131,135 ****
    (
    id integer auto_increment not null,
!   address varchar(15),
    mask    varchar(15),
    reason  varchar(255),
--- 131,135 ----
    (
    id integer auto_increment not null,
!   address varchar(64),
    mask    varchar(15),
    reason  varchar(255),