Sync with L2jServer HighFive Oct 22nd 2015.

2015-10-23 22:36:15 +00:00
parent ad889659fa
commit d49a007f9d
44 changed files with 1636 additions and 1117 deletions
--- a/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java
+++ b/trunk/java/com/l2jserver/gameserver/ai/L2AttackableAI.java
@@ -1285,17 +1285,17 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			{
 				targetReconsider();
 			}
-			else if (getAttackTarget() != null)
+			else
 			{
-				if (getAttackTarget().isMoving())
+				final L2Character target = getAttackTarget();
+				if (target != null)
 				{
-					range -= 100;
+					if (target.isMoving())
+					{
+						range -= 100;
+					}
+					moveToPawn(target, Math.max(range, 5));
 				}
-				if (range < 5)
-				{
-					range = 5;
-				}
-				moveToPawn(getAttackTarget(), range);
 			}
 			return;
 		}