[Arianne-commits] stendhal/src/games/stendhal/server/core/rule/defaultruleset DefaultEntityManager.java, 1.11, 1.12

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rule/defaultruleset
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv6164/src/games/stendhal/server/core/rule/defaultruleset

Modified Files:
	DefaultEntityManager.java 
Log Message:
cleaned up loading for the creatures xml file

Index: DefaultEntityManager.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rule/defaultruleset/DefaultEntityManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** DefaultEntityManager.java	2 Mar 2009 14:56:26 -0000	1.11
--- DefaultEntityManager.java	2 Apr 2010 23:16:19 -0000	1.12
***************
*** 13,19 ****
  package games.stendhal.server.core.rule.defaultruleset;
  
! import games.stendhal.server.core.config.CreaturesXMLLoader;
  import games.stendhal.server.core.config.ItemGroupsXMLLoader;
- import games.stendhal.server.core.engine.SingletonRepository;
  import games.stendhal.server.core.rule.EntityManager;
  import games.stendhal.server.entity.Entity;
--- 13,18 ----
  package games.stendhal.server.core.rule.defaultruleset;
  
! import games.stendhal.server.core.config.CreatureGroupsXMLLoader;
  import games.stendhal.server.core.config.ItemGroupsXMLLoader;
  import games.stendhal.server.core.rule.EntityManager;
  import games.stendhal.server.entity.Entity;
***************
*** 86,112 ****
  		createdCreature = new HashMap<String, Creature>();
  
! 		try {
! 			final CreaturesXMLLoader loader = SingletonRepository.getCreaturesXMLLoader();
! 			final List<DefaultCreature> creatures = loader.load("data/conf/creatures.xml");
  
! 			for (final DefaultCreature creature : creatures) {
! 				final String id = creature.getTileId();
! 				final String clazz = creature.getCreatureName();
  
! 				if (classToCreature.containsKey(clazz)) {
! 					LOGGER.warn("Repeated creature name: " + clazz);
! 				}
  
! 				if (!creature.verifyItems(this)) {
! 					LOGGER.warn("Items dropped by creature name: " + clazz + " doesn't exists");
! 				}
  
! 				classToCreature.put(clazz, creature);
! 				idToClass.put(id, clazz);
  
! 				WordList.getInstance().registerName(creature.getCreatureName(), ExpressionType.SUBJECT);
! 			}
! 		} catch (final org.xml.sax.SAXException e) {
! 			e.printStackTrace();
  		}
  	}
--- 85,107 ----
  		createdCreature = new HashMap<String, Creature>();
  
! 		final CreatureGroupsXMLLoader loader = new CreatureGroupsXMLLoader("/data/conf/creatures.xml");
! 		final List<DefaultCreature> creatures = loader.load();
  
! 		for (final DefaultCreature creature : creatures) {
! 			final String id = creature.getTileId();
! 			final String clazz = creature.getCreatureName();
  
! 			if (classToCreature.containsKey(clazz)) {
! 				LOGGER.warn("Repeated creature name: " + clazz);
! 			}
  
! 			if (!creature.verifyItems(this)) {
! 				LOGGER.warn("Items dropped by creature name: " + clazz + " doesn't exists");
! 			}
  
! 			classToCreature.put(clazz, creature);
! 			idToClass.put(id, clazz);
  
! 			WordList.getInstance().registerName(creature.getCreatureName(), ExpressionType.SUBJECT);
  		}
  	}