[Arianne-commits] stendhal/src/games/stendhal/server/core/engine StendhalRPZone.java, 1.33, 1.34 StendhalRPWorld.java, 1.25, 1.26

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

Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv24793/src/games/stendhal/server/core/engine

Modified Files:
	StendhalRPZone.java StendhalRPWorld.java 
Log Message:
taught dagobert to create one zone per person asking for 'vault'

Index: StendhalRPWorld.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/StendhalRPWorld.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** StendhalRPWorld.java	26 Nov 2008 23:40:45 -0000	1.25
--- StendhalRPWorld.java	27 Nov 2008 17:41:36 -0000	1.26
***************
*** 57,60 ****
--- 57,61 ----
  
  import java.net.URI;
+ import java.util.Iterator;
  
  import marauroa.common.game.IRPZone;
***************
*** 103,106 ****
--- 104,119 ----
  	}
  
+ 	public void removeZone(final StendhalRPZone toBeRemoved) {
+ 		Iterator<IRPZone> it = iterator();
+ 		while (it.hasNext()) {
+ 			IRPZone zone = it.next();
+ 			if (zone.getID().equals(toBeRemoved.getID())) {
+ 				it.remove();
+ 			}
+ 		}
+ 
+ 	}
+ 	
+ 	
  	public static StendhalRPWorld get() {
  		if (instance == null) {

Index: StendhalRPZone.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/StendhalRPZone.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** StendhalRPZone.java	7 Sep 2008 10:31:06 -0000	1.33
--- StendhalRPZone.java	27 Nov 2008 17:41:36 -0000	1.34
***************
*** 65,68 ****
--- 65,76 ----
  public class StendhalRPZone extends MarauroaRPZone {
  
+ 	public static StendhalRPZone  fillContent(final String name, final StendhalRPZone zone){
+ 		StendhalRPZone newZone = new StendhalRPZone(name, zone.getWidth(), zone.getHeight());
+ 		newZone.contents.addAll(zone.contents);
+ 		newZone.collisionMap = zone.collisionMap;
+ 		newZone.protectionMap  = zone.protectionMap;
+ 		return newZone;
+ 	}
+ 	
  	/** the logger instance. */
  	private static final Logger logger = Logger.getLogger(StendhalRPZone.class);