Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/bypasshandlers/SkillList.java (modified) (7 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/bypasshandlers/SkillList.java

@@ -15 +15 @@
 package handlers.bypasshandlers;
 
+import java.util.List;
 import java.util.logging.Level;
 
@@ -39 +40 @@
         {
                 if (!(target instanceof L2NpcInstance))
+                {
                         return false;
+                }
                 
                 if (Config.ALT_GAME_SKILL_LEARN)
@@ -48 +51 @@
                                 if (id.length() != 0)
                                 {
-                                        L2NpcInstance.showSkillList(activeChar, (L2Npc)target, ClassId.values()[Integer.parseInt(id)]);
+                                        L2NpcInstance.showSkillList(activeChar, (L2Npc) target, ClassId.values()[Integer.parseInt(id)]);
                                 }
                                 else
@@ -54 +57 @@
                                         boolean own_class = false;
                                         
-                                        ClassId[] classesToTeach = ((L2NpcInstance)target).getClassesToTeach();
-                                        if (classesToTeach != null)
+                                        final List<ClassId> classesToTeach = ((L2NpcInstance) target).getClassesToTeach();
+                                        for (ClassId cid : classesToTeach)
                                         {
-                                                for (ClassId cid : classesToTeach)
+                                                if (cid.equalsOrChildOf(activeChar.getClassId()))
                                                 {
-                                                        if (cid.equalsOrChildOf(activeChar.getClassId()))
-                                                        {
-                                                                own_class = true;
-                                                                break;
-                                                        }
+                                                        own_class = true;
+                                                        break;
                                                 }
                                         }
@@ -72 +72 @@
                                         {
                                                 String charType = activeChar.getClassId().isMage() ? "fighter" : "mage";
-                                                text +=
-                                                        "Skills of your class are the easiest to learn.<br>"+
-                                                        "Skills of another class of your race are a little harder.<br>"+
-                                                        "Skills for classes of another race are extremely difficult.<br>"+
-                                                        "But the hardest of all to learn are the  "+ charType +"skills!<br>";
+                                                text += "Skills of your class are the easiest to learn.<br>" + "Skills of another class of your race are a little harder.<br>" + "Skills for classes of another race are extremely difficult.<br>" + "But the hardest of all to learn are the  " + charType + "skills!<br>";
                                         }
                                         
                                         // make a list of classes
-                                        if (classesToTeach != null)
+                                        if (!classesToTeach.isEmpty())
                                         {
                                                 int count = 0;
@@ -90 +86 @@
                                                         {
                                                                 if (cid.level() > classCheck.level())
+                                                                {
                                                                         continue;
+                                                                }
                                                                 
                                                                 if (SkillTreesData.getInstance().getAvailableSkills(activeChar, cid, false, false).isEmpty())
+                                                                {
                                                                         continue;
+                                                                }
                                                                 
-                                                                text += "<a action=\"bypass -h npc_%objectId%_SkillList "+cid.getId()+"\">Learn "+cid+"'s class Skills</a><br>\n";
+                                                                text += "<a action=\"bypass -h npc_%objectId%_SkillList " + cid.getId() + "\">Learn " + cid + "'s class Skills</a><br>\n";
                                                                 count++;
                                                         }
@@ -103 +103 @@
                                         }
                                         else
+                                        {
                                                 text += "No Skills.<br>";
-                                        
+                                        }
                                         text += "</body></html>";
                                         
-                                        NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc)target).getObjectId());
+                                        NpcHtmlMessage html = new NpcHtmlMessage(((L2Npc) target).getObjectId());
                                         html.setHtml(text);
-                                        html.replace("%objectId%", String.valueOf(((L2Npc)target).getObjectId()));
+                                        html.replace("%objectId%", String.valueOf(((L2Npc) target).getObjectId()));
                                         activeChar.sendPacket(html);