[Arianne-commits] stendhal/src/games/stendhal/server/maps/deathmatch Spot.java, 1.7, 1.8 CreatureSpawner.java, 1.16, 1.17 DoneAction.java, 1.19, 1.20 DeathmatchEngine.java, 1.36, 1.37

[Astrid S. <ast...@us...>]

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

Modified Files:
	Spot.java CreatureSpawner.java DoneAction.java 
	DeathmatchEngine.java 
Log Message:
moving trailing comments
removing unused imports

Index: DoneAction.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/DoneAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** DoneAction.java	12 Jul 2008 14:44:12 -0000	1.19
--- DoneAction.java	23 Jul 2008 22:50:42 -0000	1.20
***************
*** 82,86 ****
  		}
  		player.updateItemAtkDef();
! 		player.setQuest("deathmatch", "done"); // without the additional information
  	}
  }
--- 82,88 ----
  		}
  		player.updateItemAtkDef();
! 		
! 		// without the additional information
! 		player.setQuest("deathmatch", "done"); 
  	}
  }

Index: CreatureSpawner.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/CreatureSpawner.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CreatureSpawner.java	12 Jul 2008 14:44:12 -0000	1.16
--- CreatureSpawner.java	23 Jul 2008 22:50:42 -0000	1.17
***************
*** 17,21 ****
  import java.util.List;
  
- 
  import org.apache.log4j.Logger;
  
--- 17,20 ----
***************
*** 24,28 ****
  public class CreatureSpawner implements TurnListener {
  static final Logger logger = Logger.getLogger(CreatureSpawner.class);
! 	static final long SPAWN_DELAY = 15000; // spawn a new monster each 15 seconds
  	static final long NUMBER_OF_CREATURES = 10;
  	private final List<Creature> sortedCreatures = new LinkedList<Creature>();
--- 23,28 ----
  public class CreatureSpawner implements TurnListener {
  static final Logger logger = Logger.getLogger(CreatureSpawner.class);
! //spawn a new monster each 15 seconds
! 	static final long SPAWN_DELAY = 15000; 
  	static final long NUMBER_OF_CREATURES = 10;
  	private final List<Creature> sortedCreatures = new LinkedList<Creature>();

Index: DeathmatchEngine.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/DeathmatchEngine.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** DeathmatchEngine.java	12 Jul 2008 14:44:12 -0000	1.36
--- DeathmatchEngine.java	23 Jul 2008 22:50:43 -0000	1.37
***************
*** 113,117 ****
  				keepRunning = false;
  			}
! 			return; // all creature are there
  		}
  
--- 113,118 ----
  				keepRunning = false;
  			}
! 			// all creature are there
! 			return; 
  		}
  

Index: Spot.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/Spot.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Spot.java	12 Jul 2008 14:44:12 -0000	1.7
--- Spot.java	23 Jul 2008 22:50:42 -0000	1.8
***************
*** 19,23 ****
  	public Spot(final StendhalRPZone zone, final int x, final int y) {
  		super();
- 		assert (zone != null); //todo: remove this
  		this.zone = zone;
  		this.x = x;
--- 19,22 ----