[Arianne-commits] stendhal/src/games/stendhal/server/util EntityHelper.java, 1.10, 1.11

[Martin F. <mar...@us...>]

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

Modified Files:
	EntityHelper.java 
Log Message:
fix 1847043: check for out-of-screen commands when interpreting player and NPC names

Index: EntityHelper.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/src/games/stendhal/server/util/EntityHelper.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** EntityHelper.java	8 Jan 2008 22:31:47 -0000	1.10
--- EntityHelper.java	8 Jan 2008 23:15:19 -0000	1.11
***************
*** 27,36 ****
  	 * @param target
  	 *            representation of the target
! 	 * @param zone
! 	 *            to search for objects
  	 * @return the entity associated either with name or id or
  	 *         <code> null </code> if none was found.
  	 */
! 	public static Entity entityFromTargetName(String target, StendhalRPZone zone) {
  		Entity entity = null;
  
--- 27,37 ----
  	 * @param target
  	 *            representation of the target
! 	 * @param player
! 	 *            to constraint for current zone and screen area
  	 * @return the entity associated either with name or id or
  	 *         <code> null </code> if none was found.
  	 */
! 	public static Entity entityFromTargetName(String target, Entity player) {
! 		StendhalRPZone zone = player.getZone();
  		Entity entity = null;
  
***************
*** 59,66 ****
  
  		if (entity != null && entity.getZone() == zone) {
! 			return entity;
! 		} else {
! 			return null;
  		}
  	}
  
--- 60,72 ----
  
  		if (entity != null && entity.getZone() == zone) {
! 			// check distance: 640x480 client screen size for 32x32 pixel tiles
! 			// -> makes 20x15 tiles screen size
! 			if (Math.abs(entity.getX() - player.getX()) <= 20 &&
! 				Math.abs(entity.getY() - player.getY()) <= 15) {
! 				return entity;
! 			}
  		}
+ 
+ 		return null;
  	}
  
***************
*** 117,121 ****
  		
  		return null;
- 	
  	}
  }
--- 123,126 ----