Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.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/ai/group_template/L2AttackableAIScript.java (modified) (3 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/ai/group_template/L2AttackableAIScript.java

@@ -17 +17 @@
 import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
 
+import java.util.List;
+
+import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlEvent;
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -207 +210 @@
                         final L2MonsterInstance mob = (L2MonsterInstance)npc;
                         if (mob.getLeader() != null)
-                                mob.getLeader().getMinionList().onMinionDie(mob, -1);
+                        {
+                                final int respawnTime = Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) > 0 ? Config.MINIONS_RESPAWN_TIME.get(mob.getNpcId()) * 1000 : -1;
+                                mob.getLeader().getMinionList().onMinionDie(mob, respawnTime);
+                        }
 
                         if (mob.hasMinions())
@@ -221 +227 @@
                 for (int level =1; level<100; level++)
                 {
-                        L2NpcTemplate[] templates = NpcTable.getInstance().getAllOfLevel(level);
-                        if ((templates != null) && (templates.length > 0))
-                        {
-                                for (L2NpcTemplate t: templates)
+                        final List<L2NpcTemplate> templates = NpcTable.getInstance().getAllOfLevel(level);
+                        for (L2NpcTemplate t : templates)
+                        {
+                                try
                                 {
-                                        try
+                                        if (L2Attackable.class.isAssignableFrom(Class.forName("com.l2jserver.gameserver.model.actor.instance."+t.getType()+"Instance")))
                                         {
-                                                if ( L2Attackable.class.isAssignableFrom(Class.forName("com.l2jserver.gameserver.model.actor.instance."+t.type+"Instance")))
-                                                {
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_ATTACK);
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_KILL);
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_SPAWN);
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_SKILL_SEE);
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_FACTION_CALL);
-                                                        ai.addEventId(t.npcId, Quest.QuestEventType.ON_AGGRO_RANGE_ENTER);
-                                                }
-                                        }
-                                        catch(ClassNotFoundException ex)
-                                        {
-                                                _log.info("Class not found "+t.type+"Instance");
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_ATTACK);
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_KILL);
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_SPAWN);
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_SKILL_SEE);
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_FACTION_CALL);
+                                                ai.addEventId(t.getNpcId(), Quest.QuestEventType.ON_AGGRO_RANGE_ENTER);
                                         }
                                 }
+                                catch(ClassNotFoundException ex)
+                                {
+                                        _log.info("Class not found "+t.getType()+"Instance");
+                                }
                         }
                 }