[Arianne-commits] stendhal/src/games/stendhal/server/core/rp/searchindex SearchIndexManager.java, 1.7, 1.8

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rp/searchindex
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16476/src/games/stendhal/server/core/rp/searchindex

Modified Files:
	SearchIndexManager.java 
Log Message:
use all configured items and creatures in the search index, not just the already created onces

Index: SearchIndexManager.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/rp/searchindex/SearchIndexManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SearchIndexManager.java	14 Feb 2014 22:12:53 -0000	1.7
--- SearchIndexManager.java	15 Feb 2014 00:06:59 -0000	1.8
***************
*** 15,20 ****
  import games.stendhal.server.core.rp.achievement.Achievement;
  import games.stendhal.server.core.rp.achievement.AchievementNotifier;
! import games.stendhal.server.entity.creature.Creature;
! import games.stendhal.server.entity.item.Item;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  
--- 15,20 ----
  import games.stendhal.server.core.rp.achievement.Achievement;
  import games.stendhal.server.core.rp.achievement.AchievementNotifier;
! import games.stendhal.server.core.rule.defaultruleset.DefaultCreature;
! import games.stendhal.server.core.rule.defaultruleset.DefaultItem;
  import games.stendhal.server.entity.npc.SpeakerNPC;
  
***************
*** 67,81 ****
  
  	private void items() {
! 		for (Item item : SingletonRepository.getEntityManager().getItems()) {
! 			System.out.print("'" + item.getName() + "' ");
! 			addName(item.getName(), SearchIndexEntryType.ITEM);
! 			addDescription(item.getName(), item.getDescription(), SearchIndexEntryType.ITEM, 10);
  		}
  	}
  
  	private void creatures() {
! 		for (Creature creature : SingletonRepository.getEntityManager().getCreatures()) {
! 			addName(creature.getName(), SearchIndexEntryType.CREATURE);
! 			addDescription(creature.getName(), creature.getDescription(), SearchIndexEntryType.CREATURE, 10);
  		}
  	}
--- 67,80 ----
  
  	private void items() {
! 		for (DefaultItem item : SingletonRepository.getEntityManager().getDefaultItems()) {
! 			addName(item.getItemName(), SearchIndexEntryType.ITEM);
! 			addDescription(item.getItemName(), item.getDescription(), SearchIndexEntryType.ITEM, 10);
  		}
  	}
  
  	private void creatures() {
! 		for (DefaultCreature creature : SingletonRepository.getEntityManager().getDefaultCreatures()) {
! 			addName(creature.getCreatureName(), SearchIndexEntryType.CREATURE);
! 			addDescription(creature.getCreatureName(), creature.getDescription(), SearchIndexEntryType.CREATURE, 10);
  		}
  	}