Changeset 1527

(2010/03/14 23:01) Almost 2 years ago

- fix mapid check on isInRange (thx sweetkr)
- fix Z distance check when attack and in knownlist

Affected files

	1526		1527
252		252
253	Creature target = (Creature) sp.getWorld().findAionObject(targetObjectId);	253	Creature target = (Creature) sp.getWorld().findAionObject(targetObjectId);
254		254
		255	//check player attack Z distance
		256	if(Math.abs(player.getZ() - target.getZ()) > 6)
		257	return;
		258
255	if(!RestrictionsManager.canAttack(player, target))	259	if(!RestrictionsManager.canAttack(player, target))
256	return;	260	return;
257		261

 	 */
 	public static boolean isInRange(VisibleObject object1, VisibleObject object2, float range)
 	{
+		if(object1.getWorldId() != object2.getWorldId())
+			return false;
 		float dx = (object2.getX() - object1.getX());
 		float dy = (object2.getY() - object1.getY());
 		return dx * dx + dy * dy < range * range;

 	// how far any visible object will see other visible object
 	private static final int						npcVisibilityDistance		= 80;
+	// maxZvisibleDistance
+	private static final int						maxZvisibleDistance 		= 400;
 	/**
 	 * Owner of this KnownList.
 	private boolean checkObjectInRange(VisibleObject owner, VisibleObject newObject)
 	{
+		//check if Z distance is greater than maxZvisibleDistance
+		if(Math.abs(owner.getZ() - newObject.getZ()) > maxZvisibleDistance)
+			return false;
 		if(owner instanceof Player)
 			return MathUtil.isInRange(owner, newObject, playerVisibilityDistance);
 		else