From: yoriy <yo...@us...> - 2010-05-31 19:57:06
|
Update of /cvsroot/arianne/stendhal/src/games/stendhal/server/util In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv8884/src/games/stendhal/server/util Modified Files: Area.java Log Message: added function for checking if area contains respawn point Index: Area.java =================================================================== RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/util/Area.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** Area.java 9 Jan 2010 00:00:27 -0000 1.19 --- Area.java 31 May 2010 19:56:58 -0000 1.20 *************** *** 3,6 **** --- 3,7 ---- import games.stendhal.server.core.engine.StendhalRPZone; import games.stendhal.server.entity.Entity; + import games.stendhal.server.entity.mapstuff.spawner.CreatureRespawnPoint; import games.stendhal.server.entity.player.Player; *************** *** 70,73 **** --- 71,93 ---- && shape.contains(entity.getX(), entity.getY()); } + + /** + * Checks whether an entity is in this area (e. g. on this zone and inside of + * the shape) + * + * @param entity + * An entity to check + * @return true, if and only if the entity is in this area. + */ + public boolean contains(final CreatureRespawnPoint point) { + if (point == null) { + return false; + } + final IRPZone entityZone = point.getZone(); + + // We have ask the zone whether it knows about the entity because + // player-objects stay alive some time after logout. + return zone.equals(entityZone) && shape.contains(point.getX(), point.getY()); + } /** |