diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java index 4f6aa3510b..598c7fba73 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java @@ -23,7 +23,6 @@ import java.io.FilenameFilter; import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import java.util.StringTokenizer; import java.util.logging.Logger; @@ -130,10 +129,8 @@ public class ClanTable public Clan createClan(PlayerInstance player, String clanName) { - Iterator iter = _clans.values().iterator(); - while (iter.hasNext()) + for (Clan oldClans : _clans.values()) { - Clan oldClans = iter.next(); if (!oldClans.getName().equalsIgnoreCase(clanName)) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java index ae61ed3b30..f710bde084 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.FileReader; import java.io.LineNumberReader; import java.util.HashMap; -import java.util.Iterator; import java.util.StringTokenizer; import java.util.logging.Logger; @@ -174,10 +173,8 @@ public class ItemTable private void fixEtcItems(HashMap items) { - Iterator iter = items.keySet().iterator(); - while (iter.hasNext()) + for (int key : items.keySet()) { - Integer key = iter.next(); EtcItem item = (EtcItem) items.get(key); if ((item.getWeight() == 0) && (item.getEtcItemType() != 7) && !item.getName().startsWith("world_map") && !item.getName().startsWith("crystal_")) { @@ -444,61 +441,52 @@ public class ItemTable private void buildFastLookupTable() { - Item item; - Integer id; int highestId = 0; - Iterator iter = _armors.keySet().iterator(); - while (iter.hasNext()) + for (int id : _armors.keySet()) { - id = iter.next(); - item = _armors.get(id); - if (item.getItemId() <= highestId) + if (id <= highestId) { continue; } - highestId = item.getItemId(); + highestId = id; } - iter = _weapons.keySet().iterator(); - while (iter.hasNext()) + for (int id : _weapons.keySet()) { - id = iter.next(); - item = _weapons.get(id); - if (item.getItemId() <= highestId) + if (id <= highestId) { continue; } - highestId = item.getItemId(); + highestId = id; } - iter = _etcItems.keySet().iterator(); - while (iter.hasNext()) + for (int id : _etcItems.keySet()) { - id = iter.next(); - item = _etcItems.get(id); - if (item.getItemId() <= highestId) + if (id <= highestId) { continue; } - highestId = item.getItemId(); + highestId = id; } _log.fine("Highest item id used: " + highestId); + + // Create a FastLookUp Table called _allTemplates of size : value of the highest item ID _allTemplates = new Item[highestId + 1]; - iter = _armors.keySet().iterator(); - while (iter.hasNext()) + + // Insert armor item in Fast Look Up Table + for (Item armor : _armors.values()) { - id = iter.next(); - _allTemplates[id.intValue()] = item = _armors.get(id); + _allTemplates[armor.getItemId()] = armor; } - iter = _weapons.keySet().iterator(); - while (iter.hasNext()) + + // Insert weapon item in Fast Look Up Table + for (Item weapon : _weapons.values()) { - id = iter.next(); - _allTemplates[id.intValue()] = item = _weapons.get(id); + _allTemplates[weapon.getItemId()] = weapon; } - iter = _etcItems.keySet().iterator(); - while (iter.hasNext()) + + // Insert etcItem item in Fast Look Up Table + for (Item etcItem : _etcItems.values()) { - id = iter.next(); - _allTemplates[id.intValue()] = item = _etcItems.get(id); + _allTemplates[etcItem.getItemId()] = etcItem; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java index 24d27d5839..eed5f3d67c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.FileWriter; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.TreeMap; @@ -244,10 +243,8 @@ public class Clan public void broadcastToOnlineMembers(ServerBasePacket packet) { - Iterator iter = _members.values().iterator(); - while (iter.hasNext()) + for (ClanMember member : _members.values()) { - ClanMember member = iter.next(); if (!member.isOnline()) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java index a7414084db..48c1c2f5a9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; @@ -564,11 +563,9 @@ public class Inventory private void refreshWeight() { int weight = 0; - Iterator iter = _items.iterator(); - while (iter.hasNext()) + for (ItemInstance item : _items) { - ItemInstance element = iter.next(); - weight += element.getItem().getWeight() * element.getCount(); + weight += item.getItem().getWeight() * item.getCount(); } _totalWeight = weight; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java index 19c6cae917..6af1cbe634 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model; import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; @@ -86,11 +85,9 @@ public class World int x = object.getX(); int y = object.getY(); int sqRadius = 4000000; - Iterator iter = _allPlayers.values().iterator(); - while (iter.hasNext()) + for (PlayerInstance player : _allPlayers.values()) { long dy; - PlayerInstance player = iter.next(); int x1 = player.getX(); long dx = x1 - x; long sqDist = (dx * dx) + ((dy = player.getY() - y) * dy); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 978733a2e9..1d545b9928 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -23,7 +23,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.Timer; import java.util.TimerTask; import java.util.logging.Logger; @@ -192,10 +191,9 @@ public class Attackable extends NpcInstance private void calculateRewards(Creature lastAttacker) { + // TODO: Figure iterator logic and replace with for, if possible. Iterator it = _aggroList.keySet().iterator(); - // int numberOfAttackers = this._aggroList.size(); int npcID = getNpcTemplate().getNpcId(); - // int npcLvl = this.getLevel(); while (it.hasNext()) { PlayerInstance temp; @@ -293,12 +291,8 @@ public class Attackable extends NpcInstance public void doItemDrop() { - List drops = getNpcTemplate().getDropData(); - _log.finer("This npc has " + drops.size() + " drops defined."); - Iterator iter = drops.iterator(); - while (iter.hasNext()) + for (DropData drop : getNpcTemplate().getDropData()) { - DropData drop = iter.next(); if (drop.isSweep() || (Rnd.get(1000000) >= (drop.getChance() * Config.RATE_DROP))) { continue; @@ -434,11 +428,8 @@ public class Attackable extends NpcInstance if (!isInCombat()) { _log.finer(getObjectId() + ": monster knows " + getKnownPlayers().size() + " players"); - Set knownPlayers = getKnownPlayers(); - Iterator iter = knownPlayers.iterator(); - while (iter.hasNext()) + for (PlayerInstance player : getKnownPlayers()) { - PlayerInstance player = iter.next(); if (!getCondition2(player) || !(getDistance(player.getX(), player.getY()) <= (getCollisionRadius() + 200.0))) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ce37166eac..a60a07f2d3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.model.actor.instance; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Timer; @@ -1418,10 +1417,8 @@ public class PlayerInstance extends Creature int level = getSkillLevel(magicId); if ((skill.getTargetType() == Skill.TARGET_PARTY) && isInParty()) { - Iterator it = getParty().getPartyMembers().iterator(); - while (it.hasNext()) + for (PlayerInstance player : getParty().getPartyMembers()) { - PlayerInstance player = it.next(); // _log.fine("msl: " + getName() + " " + magicId + " " + level + " " + player.getName()); MagicSkillLaunched msl = new MagicSkillLaunched(this, magicId, level, player); sendPacket(msl); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java index 40bc849a1b..42f8678552 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java @@ -17,9 +17,6 @@ */ package org.l2jmobius.gameserver.network.clientpackets; -import java.util.Iterator; -import java.util.Set; - import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; @@ -79,11 +76,8 @@ public class Say2 extends ClientBasePacket } else if (type == 0) { - Set players = activeChar.getKnownPlayers(); - Iterator iter = players.iterator(); - while (iter.hasNext()) + for (PlayerInstance player : activeChar.getKnownPlayers()) { - PlayerInstance player = iter.next(); player.sendPacket(cs); } activeChar.sendPacket(cs); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java index eb534ef2a2..f956745abd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java @@ -26,7 +26,6 @@ import java.io.LineNumberReader; import java.net.InetAddress; import java.security.MessageDigest; import java.util.Base64; -import java.util.Iterator; import java.util.Map; import java.util.StringTokenizer; import java.util.concurrent.ConcurrentHashMap; @@ -165,20 +164,17 @@ public class AccountData { try { - FileWriter save = new FileWriter(new File("data/accounts.txt")); - Iterator iter = _logPass.keySet().iterator(); - while (iter.hasNext()) + FileWriter writer = new FileWriter(new File("data/accounts.txt")); + for (String name : _logPass.keySet()) { - String name = iter.next(); - byte[] pass = _logPass.get(name); - save.write(name); - save.write("\t"); - save.write(Base64.getEncoder().encodeToString(pass)); - save.write("\t"); - save.write("" + _accessLevels.get(name)); - save.write("\r\n"); + writer.write(name); + writer.write("\t"); + writer.write(Base64.getEncoder().encodeToString(_logPass.get(name))); + writer.write("\t"); + writer.write("" + _accessLevels.get(name)); + writer.write("\r\n"); } - save.close(); + writer.close(); } catch (Exception e) {