Explorar el Código

Support for enemyRange in knownlist range.

JIV hace 14 años
padre
commit
69b2da70b8

+ 2 - 6
L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/AttackableKnownList.java

@@ -75,12 +75,8 @@ public class AttackableKnownList extends NpcKnownList
 		if (object instanceof L2Playable)
 			return object.getKnownList().getDistanceToWatchObject(getActiveObject());
 		
-		if (getActiveChar().getAggroRange() > getActiveChar().getFactionRange())
-			return getActiveChar().getAggroRange();
+		int max = Math.max(300, Math.max(getActiveChar().getAggroRange(), Math.max(getActiveChar().getFactionRange(), getActiveChar().getEnemyRange())));
 		
-		if (getActiveChar().getFactionRange() > 300)
-			return getActiveChar().getFactionRange();
-		
-		return 300;
+		return max;
 	}
 }