Changeset 5090

Timestamp:

Nov 21, 2011 1:49:36 PM (6 months ago)

Author:

Zoey76

Message:

BETA: L2AttackableAI fix:

• Fixed short/long range skills mapping.
• Proper logger for L2AttackableAI and L2ControllableMobAI.
• Thanks pmq, dljac, UnAfraid? for report.
• Fox for #5781

Location:

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai

Files:

• L2AttackableAI.java (modified) (8 diffs)
• L2ControllableMobAI.java (modified) (2 diffs)

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -22 +22 @@
 import java.util.concurrent.Future;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javolution.util.FastList;
@@ -63 +64 @@
 public class L2AttackableAI extends L2CharacterAI implements Runnable
 {
-        //protected static final Logger _log = Logger.getLogger(L2AttackableAI.class.getName());
+        private static final Logger _log = Logger.getLogger(L2AttackableAI.class.getName());
         
         private static final int RANDOM_WALK_RATE = 30; // confirmed
@@ -84 +85 @@
         private int chaostime = 0;
         private final L2NpcTemplate _skillrender;
+        private FastList<L2Skill> shortRangeSkills = new FastList<>();
+        private FastList<L2Skill> longRangeSkills = new FastList<>();
         int lastBuffTick;
         
@@ -1100 +1103 @@
                         
                         // --------------------------------------------------------------------------------
-                        // Long/Short Range skill Usage
+                        // Long/Short Range skill usage.
                         if (npc.hasLSkill() || npc.hasSSkill())
                         {
@@ -1106 +1109 @@
                                 if (npc.hasSSkill() && dist2 <= 150 && Rnd.get(100) <= npc.getSSkillChance())
                                 {
-                                        if (cast(shortRangeSkills.get(Rnd.nextInt(shortRangeSkills.size()))))
+                                        final L2Skill shortRangeSkill = shortRangeSkills.get(Rnd.get(shortRangeSkills.size()));
+                                        if ((shortRangeSkill != null) && cast(shortRangeSkill))
                                         {
                                                 return;
@@ -1112 +1116 @@
                                         for (L2Skill sk : shortRangeSkills)
                                         {
-                                                if (cast(sk))
+                                                if ((sk != null) && cast(sk))
                                                 {
                                                         return;
@@ -1124 +1128 @@
                                         for (L2Skill sk : longRangeSkills)
                                         {
-                                                if (cast(sk))
+                                                if ((sk != null) && cast(sk))
                                                 {
                                                         return;
@@ -2364 +2368 @@
         private FastList<L2Skill> longRangeSkillRender()
         {
-                if (_skillrender.getLongRangeSkills().isEmpty())
-                {
-                        return getActiveChar().getLongRangeSkill();
-                }
-                return _skillrender.getLongRangeSkills();
+                longRangeSkills = _skillrender.getLongRangeSkills();
+                if (longRangeSkills.isEmpty())
+                {
+                        longRangeSkills = getActiveChar().getLongRangeSkill();
+                }
+                return longRangeSkills;
         }
         
         private FastList<L2Skill> shortRangeSkillRender()
         {
-                if (_skillrender.getShortRangeSkills().isEmpty())
-                {
-                        return getActiveChar().getShortRangeSkill();
-                }
-                return _skillrender.getShortRangeSkills();
+                shortRangeSkills = _skillrender.getLongRangeSkills();
+                if (shortRangeSkills.isEmpty())
+                {
+                        shortRangeSkills = getActiveChar().getShortRangeSkill();
+                }
+                return shortRangeSkills;
         }
         

branches/unstable/L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java

@@ -21 +21 @@
 import java.util.List;
 import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import javolution.util.FastList;
@@ -41 +42 @@
 
 /**
+ * AI for controllable mobs
  * @author littlecrow
- * AI for controllable mobs
- *
  */
 public class L2ControllableMobAI extends L2AttackableAI
 {
+        private static final Logger _log = Logger.getLogger(L2AttackableAI.class.getName());
+        
         public static final int AI_IDLE = 1;
         public static final int AI_NORMAL = 2;