Browse Source

BETA: Datapack part for [L5801].

Zoey76 12 years ago
parent
commit
49a418fdaa

+ 2 - 8
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java

@@ -18,8 +18,6 @@
  */
 package ai.group_template;
 
-import java.util.Set;
-
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -43,13 +41,9 @@ public class NonLethalableNpcs extends AbstractNpcAI
 		
 		for (int npcId : NPCS)
 		{
-			final Set<L2Spawn> spawns = SpawnTable.getInstance().getSpawns(npcId);
-			if (spawns != null)
+			for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId))
 			{
-				for (L2Spawn spawn : spawns)
-				{
-					onSpawn(spawn.getLastSpawn());
-				}
+				onSpawn(spawn.getLastSpawn());
 			}
 		}
 	}

+ 4 - 10
L2J_DataPack_BETA/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java

@@ -18,8 +18,6 @@
  */
 package ai.group_template;
 
-import java.util.Set;
-
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -59,16 +57,12 @@ public class SeeThroughSilentMove extends AbstractNpcAI
 		super(name, descr);
 		for (int npcId : MOBIDS)
 		{
-			final Set<L2Spawn> spawns = SpawnTable.getInstance().getSpawns(npcId);
-			if (spawns != null)
+			for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(npcId))
 			{
-				for (L2Spawn spawn : spawns)
+				final L2Npc npc = spawn.getLastSpawn();
+				if ((npc != null) && npc.isL2Attackable())
 				{
-					final L2Npc npc = spawn.getLastSpawn();
-					if ((npc != null) && npc.isL2Attackable())
-					{
-						((L2Attackable) npc).setSeeThroughSilentMove(true);
-					}
+					((L2Attackable) npc).setSeeThroughSilentMove(true);
 				}
 			}
 		}

+ 3 - 8
L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Dorian/Dorian.java

@@ -18,8 +18,6 @@
  */
 package ai.npc.Dorian;
 
-import java.util.Set;
-
 import quests.Q00024_InhabitantsOfTheForestOfTheDead.Q00024_InhabitantsOfTheForestOfTheDead;
 import ai.npc.AbstractNpcAI;
 
@@ -81,13 +79,10 @@ public class Dorian extends AbstractNpcAI
 	{
 		super(name, descr);
 		addSpawnId(DORIAN);
-		final Set<L2Spawn> spawns = SpawnTable.getInstance().getSpawns(DORIAN);
-		if (spawns != null)
+		
+		for (L2Spawn spawn : SpawnTable.getInstance().getSpawns(DORIAN))
 		{
-			for (L2Spawn spawn : spawns)
-			{
-				startQuestTimer("checkArea", 3000, spawn.getLastSpawn(), null, true);
-			}
+			startQuestTimer("checkArea", 3000, spawn.getLastSpawn(), null, true);
 		}
 	}