From: Astrid S. <ast...@us...> - 2008-07-08 11:34:32
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv14426/src/games/stendhal/server/core/engine Modified Files: StendhalRPZone.java Log Message: flowergrowers only grow on FertileGround. if there is no fertileground it dissappears after one cycle Index: StendhalRPZone.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/core/engine/StendhalRPZone.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** StendhalRPZone.java 5 Jul 2008 13:13:09 -0000 1.24 --- StendhalRPZone.java 8 Jul 2008 11:34:28 -0000 1.25 *************** *** 13,20 **** --- 13,23 ---- package games.stendhal.server.core.engine; + import static org.hamcrest.Matchers.instanceOf; import games.stendhal.common.CRC; import games.stendhal.common.CollisionDetection; import games.stendhal.common.Debug; import games.stendhal.common.Line; + import games.stendhal.common.filter.CollectionFilter; + import games.stendhal.common.filter.FilterCriteria; import games.stendhal.server.core.events.MovementListener; import games.stendhal.server.core.rp.StendhalRPAction; *************** *** 50,53 **** --- 53,57 ---- import java.util.LinkedList; import java.util.List; + import java.util.Map; import java.util.Set; import java.util.Vector; *************** *** 56,59 **** --- 60,64 ---- import marauroa.common.game.RPObject; import marauroa.common.game.RPSlot; + import marauroa.common.game.RPObject.ID; import marauroa.common.net.OutputSerializer; import marauroa.common.net.message.TransferContent; *************** *** 1163,1165 **** --- 1168,1189 ---- } + + public List<Entity> getFilteredEntities(final FilterCriteria<Entity> criteria) { + List <Entity> result = new LinkedList<Entity>(); + + for (RPObject obj : objects.values()) { + if (obj instanceof Entity) { + Entity entity = (Entity) obj; + if (criteria.passes(entity)){ + result.add(entity); + } + + } + } + + return result; + + + } + } |