[Arianne-commits] stendhal/src/games/stendhal/server StendhalRPRuleProcessor.java, 1.241, 1.242

[ChadF <ch...@us...>]

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv836/src/games/stendhal/server

Modified Files:
	StendhalRPRuleProcessor.java 
Log Message:
Account for removing/readding npc's in the same cycle.


Index: StendhalRPRuleProcessor.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/StendhalRPRuleProcessor.java,v
retrieving revision 1.241
retrieving revision 1.242
diff -C2 -d -r1.241 -r1.242
*** StendhalRPRuleProcessor.java	24 Sep 2007 13:05:55 -0000	1.241
--- StendhalRPRuleProcessor.java	29 Sep 2007 17:52:31 -0000	1.242
***************
*** 252,258 ****
  			StendhalQuestSystem.get().init();
  
  			for (IRPZone zone : StendhalRPWorld.get()) {
  				StendhalRPZone szone = (StendhalRPZone) zone;
- 				npcs.addAll(szone.getNPCList());
  				respawnPoints.addAll(szone.getRespawnPointList());
  				plantGrowers.addAll(szone.getPlantGrowers());
--- 252,261 ----
  			StendhalQuestSystem.get().init();
  
+ 			/*
+ 			 * TODO: Have these directly added here when added
+ 			 * to zone, or let zone handle all of them directly
+ 			 */
  			for (IRPZone zone : StendhalRPWorld.get()) {
  				StendhalRPZone szone = (StendhalRPZone) zone;
  				respawnPoints.addAll(szone.getRespawnPointList());
  				plantGrowers.addAll(szone.getPlantGrowers());
***************
*** 304,308 ****
  
  	public void addNPC(NPC npc) {
! 		npcsToAdd.add(npc);
  	}
  
--- 307,315 ----
  
  	public void addNPC(NPC npc) {
! 		npcsToRemove.remove(npc);
! 
! 		if(!npcs.contains(npc)) {
! 			npcsToAdd.add(npc);
! 		}
  	}