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

Dropped some Iterator uses.

Browse Source
This commit is contained in:
MobiusDev
2016-04-30 18:06:44 +00:00
parent 25fae223c2
commit 15d263a788
9 changed files with 24 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/java/com/l2jmobius/gameserver/model/entity/Siege.java
View File

@ -22,7 +22,6 @@ import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledFuture;
@ -1083,13 +1082,11 @@ public class Siege implements Siegable
case NotOwner:
{
players = getPlayersInZone();
final Iterator<L2PcInstance> it = players.iterator();
while (it.hasNext())
for (L2PcInstance player : players)
{
final L2PcInstance player = it.next();
if ((player == null) || player.inObserverMode() || ((player.getClanId() > 0) && (player.getClanId() == getCastle().getOwnerId())))
{
it.remove();
players.remove(player);
}
}
break;

21
trunk/java/com/l2jmobius/gameserver/model/entity/TvTEvent.java
View File

@ -17,7 +17,6 @@
package com.l2jmobius.gameserver.model.entity;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -189,17 +188,13 @@ public class TvTEvent
_teams[0].cleanMe();
_teams[1].cleanMe();
L2PcInstance player;
Iterator<L2PcInstance> iter;
if (needParticipationFee())
{
iter = allParticipants.values().iterator();
while (iter.hasNext())
for (L2PcInstance player : allParticipants.values())
{
player = iter.next();
if (!hasParticipationFee(player))
{
iter.remove();
allParticipants.remove(player.getObjectId());
}
}
}
@ -253,22 +248,18 @@ public class TvTEvent
if (needParticipationFee())
{
iter = _teams[0].getParticipatedPlayers().values().iterator();
while (iter.hasNext())
for (L2PcInstance player : _teams[0].getParticipatedPlayers().values())
{
player = iter.next();
if (!payParticipationFee(player))
{
iter.remove();
_teams[0].removePlayer(player.getObjectId());
}
}
iter = _teams[1].getParticipatedPlayers().values().iterator();
while (iter.hasNext())
for (L2PcInstance player : _teams[1].getParticipatedPlayers().values())
{
player = iter.next();
if (!payParticipationFee(player))
{
iter.remove();
_teams[1].removePlayer(player.getObjectId());
}
}
}