lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed most unnecessary Iterator usage.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-11-22 12:39:58 +00:00
parent e58550493c
commit 3cc1e5cbfe
9 changed files with 43 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ClanTable.java
View File

@ -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<Clan> iter = _clans.values().iterator();
while (iter.hasNext())
for (Clan oldClans : _clans.values())
{
Clan oldClans = iter.next();
if (!oldClans.getName().equalsIgnoreCase(clanName))
{
continue;

60
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/ItemTable.java
View File

@ -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<Integer, Item> items)
{
Iterator<Integer> 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<Integer> 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;
}
}

5
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java
View File

@ -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<ClanMember> iter = _members.values().iterator();
while (iter.hasNext())
for (ClanMember member : _members.values())
{
ClanMember member = iter.next();
if (!member.isOnline())
{
continue;

7
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java
View File

@ -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<ItemInstance> 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;
}

5
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java
View File

@ -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<PlayerInstance> 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);

15
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@ -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<WorldObject> 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<DropData> drops = getNpcTemplate().getDropData();
_log.finer("This npc has " + drops.size() + " drops defined.");
Iterator<DropData> 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<PlayerInstance> knownPlayers = getKnownPlayers();
Iterator<PlayerInstance> 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;

5
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@ -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<PlayerInstance> 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);

8
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Say2.java
View File

@ -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<PlayerInstance> players = activeChar.getKnownPlayers();
Iterator<PlayerInstance> iter = players.iterator();
while (iter.hasNext())
for (PlayerInstance player : activeChar.getKnownPlayers())
{
PlayerInstance player = iter.next();
player.sendPacket(cs);
}
activeChar.sendPacket(cs);

22
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/loginserver/data/AccountData.java
View File

@ -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<String> 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)
{