Replaced for loops with enhanced for loops.

This commit is contained in:
MobiusDev 2018-09-09 17:56:05 +00:00
parent 10be587e80
commit 31dadef4b8
21 changed files with 57 additions and 59 deletions

View File

@ -263,14 +263,14 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
private void startEffectZonesControl()
{
for (int i = 0; i < _regionsData.length; i++)
for (SeedRegion a_regionsData : _regionsData)
{
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
for (int j = 0; j < a_regionsData.af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
a_regionsData.af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, a_regionsData.af_spawns[j][0], a_regionsData.af_spawns[j][1], a_regionsData.af_spawns[j][2], a_regionsData.af_spawns[j][3], false, 0);
a_regionsData.af_npcs[j].setDisplayEffect(a_regionsData.activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
}

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -263,14 +263,14 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
private void startEffectZonesControl()
{
for (int i = 0; i < _regionsData.length; i++)
for (SeedRegion a_regionsData : _regionsData)
{
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
for (int j = 0; j < a_regionsData.af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
a_regionsData.af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, a_regionsData.af_spawns[j][0], a_regionsData.af_spawns[j][1], a_regionsData.af_spawns[j][2], a_regionsData.af_spawns[j][3], false, 0);
a_regionsData.af_npcs[j].setDisplayEffect(a_regionsData.activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
}

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -263,14 +263,14 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
private void startEffectZonesControl()
{
for (int i = 0; i < _regionsData.length; i++)
for (SeedRegion a_regionsData : _regionsData)
{
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
for (int j = 0; j < a_regionsData.af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
a_regionsData.af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, a_regionsData.af_spawns[j][0], a_regionsData.af_spawns[j][1], a_regionsData.af_spawns[j][2], a_regionsData.af_spawns[j][3], false, 0);
a_regionsData.af_npcs[j].setDisplayEffect(a_regionsData.activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
}

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -263,14 +263,14 @@ public final class SeedOfAnnihilation extends AbstractNpcAI
private void startEffectZonesControl()
{
for (int i = 0; i < _regionsData.length; i++)
for (SeedRegion a_regionsData : _regionsData)
{
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
for (int j = 0; j < a_regionsData.af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
a_regionsData.af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, a_regionsData.af_spawns[j][0], a_regionsData.af_spawns[j][1], a_regionsData.af_spawns[j][2], a_regionsData.af_spawns[j][3], false, 0);
a_regionsData.af_npcs[j].setDisplayEffect(a_regionsData.activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
}

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -261,14 +261,14 @@ public class SeedOfAnnihilation extends AbstractNpcAI
private void startEffectZonesControl()
{
for (int i = 0; i < _regionsData.length; i++)
for (SeedRegion a_regionsData : _regionsData)
{
for (int j = 0; j < _regionsData[i].af_spawns.length; j++)
for (int j = 0; j < a_regionsData.af_spawns.length; j++)
{
_regionsData[i].af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, _regionsData[i].af_spawns[j][0], _regionsData[i].af_spawns[j][1], _regionsData[i].af_spawns[j][2], _regionsData[i].af_spawns[j][3], false, 0);
_regionsData[i].af_npcs[j].setDisplayEffect(_regionsData[i].activeBuff);
a_regionsData.af_npcs[j] = addSpawn(ANNIHILATION_FURNACE, a_regionsData.af_spawns[j][0], a_regionsData.af_spawns[j][1], a_regionsData.af_spawns[j][2], a_regionsData.af_spawns[j][3], false, 0);
a_regionsData.af_npcs[j].setDisplayEffect(a_regionsData.activeBuff);
}
ZoneManager.getInstance().getZoneById(_regionsData[i].buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[_regionsData[i].activeBuff], 1);
ZoneManager.getInstance().getZoneById(a_regionsData.buff_zone, L2EffectZone.class).addSkill(ZONE_BUFFS[a_regionsData.activeBuff], 1);
}
startQuestTimer("ChangeSeedsStatus", _seedsNextStatusChange - System.currentTimeMillis(), null, null);
}

View File

@ -204,9 +204,8 @@ public final class Orfen extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("check_minion_loc"))
{
for (int i = 0; i < MINIONS.size(); i++)
for (L2Attackable mob : MINIONS)
{
final L2Attackable mob = MINIONS.get(i);
if (!npc.isInsideRadius2D(mob, 3000))
{
mob.teleToLocation(npc.getLocation());
@ -217,9 +216,8 @@ public final class Orfen extends AbstractNpcAI
}
else if (event.equalsIgnoreCase("despawn_minions"))
{
for (int i = 0; i < MINIONS.size(); i++)
for (L2Attackable mob : MINIONS)
{
final L2Attackable mob = MINIONS.get(i);
if (mob != null)
{
mob.decayMe();

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{

View File

@ -97,9 +97,9 @@ public class PetNameTable
{
boolean result = true;
final char[] chars = text.toCharArray();
for (int i = 0; i < chars.length; i++)
for (char aChar : chars)
{
if (!Character.isLetterOrDigit(chars[i]))
if (!Character.isLetterOrDigit(aChar))
{
result = false;
break;

View File

@ -76,9 +76,9 @@ class LauncherThread extends Thread
@Override
public void run()
{
outer: for (int i = 0; i < collectors.length; i++)
outer: for (TaskCollector collector : collectors)
{
TaskTable taskTable = collectors[i].getTasks();
TaskTable taskTable = collector.getTasks();
int size = taskTable.size();
for (int j = 0; j < size; j++)
{