[Arianne-commits] stendhal/src/games/stendhal/server/maps/deathmatch Deathmatch.java, 1.10, 1.11 DealWithLogoutCoward.java, 1.2, 1.3 DeathmatchInfo.java, 1.2, 1.3

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

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

Modified Files:
	Deathmatch.java DealWithLogoutCoward.java DeathmatchInfo.java 
Log Message:
moved deathmatchInfo bookkeeping from Deathmatch into DeathmatchInfo

Index: DeathmatchInfo.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/DeathmatchInfo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeathmatchInfo.java	21 Mar 2007 23:30:14 -0000	1.2
--- DeathmatchInfo.java	21 Mar 2007 23:40:44 -0000	1.3
***************
*** 1,4 ****
--- 1,7 ----
  package games.stendhal.server.maps.deathmatch;
  
+ import java.util.LinkedList;
+ import java.util.List;
+ 
  import games.stendhal.server.StendhalRPZone;
  import games.stendhal.server.util.Area;
***************
*** 10,13 ****
--- 13,18 ----
   */
  public class DeathmatchInfo {
+ 	private static List<DeathmatchInfo> deathmatches = new LinkedList<DeathmatchInfo>();
+ 
  	private final Area arena;
  	private final String zoneName;
***************
*** 54,57 ****
  		return zoneName;
  	}
! 	
  }
--- 59,79 ----
  		return zoneName;
  	}
! 
! 	/**
! 	 * Registers a new deathmatch
! 	 *
! 	 * @param deathmatchInfo deathmatchInfo
! 	 */
! 	public static void add(DeathmatchInfo deathmatchInfo) {
! 		deathmatches.add(deathmatchInfo);
! 	}
! 
! 	/**
! 	 * returns a list of all Deathmachtes
! 	 *
! 	 * @return list of deathmatches
! 	 */
! 	static List<DeathmatchInfo> getDeathmatches() {
! 		return deathmatches;
! 	}
  }

Index: Deathmatch.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/Deathmatch.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Deathmatch.java	21 Mar 2007 23:28:28 -0000	1.10
--- Deathmatch.java	21 Mar 2007 23:40:44 -0000	1.11
***************
*** 30,34 ****
  	private Area arena = null;
  	private DeathmatchInfo deathmatchInfo = null;
- 	private static List<DeathmatchInfo> deathmatches = new LinkedList<DeathmatchInfo>();
  	
  	public Deathmatch() {
--- 30,33 ----
***************
*** 41,45 ****
  		deathmatchInfo = new DeathmatchInfo(arena, zoneName, zone);
  		zone.setTeleportable(false);
! 		deathmatches.add(deathmatchInfo);
  	}
  
--- 40,44 ----
  		deathmatchInfo = new DeathmatchInfo(arena, zoneName, zone);
  		zone.setTeleportable(false);
! 		DeathmatchInfo.add(deathmatchInfo);
  	}
  
***************
*** 129,139 ****
  	}
  
- 	/**
- 	 * returns a list of all Deathmachtes
- 	 *
- 	 * @return list of deathmatches
- 	 */
- 	static List<DeathmatchInfo> getDeathmatches() {
- 		return deathmatches;
- 	}
  }
--- 128,130 ----

Index: DealWithLogoutCoward.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/maps/deathmatch/DealWithLogoutCoward.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DealWithLogoutCoward.java	21 Mar 2007 23:22:43 -0000	1.2
--- DealWithLogoutCoward.java	21 Mar 2007 23:40:44 -0000	1.3
***************
*** 17,21 ****
  
  	public void onTurnReached(int currentTurn, String message) {
! 		for (DeathmatchInfo deathmatchInfo : Deathmatch.getDeathmatches()) {
  			if (deathmatchInfo.getArena().contains(player)) {
  				StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("0_semos_mountain_n2_w");
--- 17,21 ----
  
  	public void onTurnReached(int currentTurn, String message) {
! 		for (DeathmatchInfo deathmatchInfo : DeathmatchInfo.getDeathmatches()) {
  			if (deathmatchInfo.getArena().contains(player)) {
  				StendhalRPZone zone = (StendhalRPZone) StendhalRPWorld.get().getRPZone("0_semos_mountain_n2_w");