Removed most stream filter uses.

This commit is contained in:
MobiusDevelopment
2020-06-18 16:09:02 +00:00
parent c612ba62ca
commit cf0ee224f8
1223 changed files with 24696 additions and 7524 deletions

View File

@ -532,10 +532,18 @@ public class MailBBSManager extends BaseBBSManager
final Timestamp ts = new Timestamp(currentDate - 86400000);
// Check sender mails based on previous timestamp. If more than 10 mails have been found for today, then cancel the use.
if (getPlayerMails(activeChar.getObjectId()).stream().filter(l -> l.sentDate.after(ts) && (l.location == MailType.SENTBOX)).count() >= 10)
int count = 0;
for (Mail mail : getPlayerMails(activeChar.getObjectId()))
{
activeChar.sendPacket(SystemMessageId.NO_MORE_MESSAGES_MAY_BE_SENT_AT_THIS_TIME_EACH_ACCOUNT_IS_ALLOWED_10_MESSAGES_PER_DAY);
return;
if (mail.sentDate.after(ts) && (mail.location == MailType.SENTBOX))
{
count++;
}
if (count >= 10)
{
activeChar.sendPacket(SystemMessageId.NO_MORE_MESSAGES_MAY_BE_SENT_AT_THIS_TIME_EACH_ACCOUNT_IS_ALLOWED_10_MESSAGES_PER_DAY);
return;
}
}
// Format recipient names. If more than 5 are found, cancel the mail.

View File

@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.datatables.xml;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@ -86,8 +85,15 @@ public class FishData implements IXmlReader
*/
public Fish getFish(int lvl, int type, int group)
{
final List<Fish> fish = _fish.stream().filter(f -> (f.getLevel() == lvl) && (f.getType() == type) && (f.getGroup() == group)).collect(Collectors.toList());
return fish.get(Rnd.get(fish.size()));
final List<Fish> result = new ArrayList<>();
for (Fish fish : _fish)
{
if ((fish.getLevel() == lvl) && (fish.getType() == type) && (fish.getGroup() == group))
{
result.add(fish);
}
}
return result.get(Rnd.get(result.size()));
}
public static FishData getInstance()

View File

@ -17,10 +17,10 @@
package org.l2jmobius.gameserver.datatables.xml;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
@ -91,7 +91,15 @@ public class HennaData implements IXmlReader
*/
public List<Henna> getAvailableHennasFor(PlayerInstance player)
{
return _hennas.values().stream().filter(h -> h.canBeUsedBy(player)).collect(Collectors.toList());
final List<Henna> result = new ArrayList<>();
for (Henna henna : _hennas.values())
{
if (henna.canBeUsedBy(player))
{
result.add(henna);
}
}
return result;
}
public static HennaData getInstance()

View File

@ -90,17 +90,19 @@ public class FenceInstance extends WorldObject
deleteObjects[i] = new DeleteObject(_heightFences[i]);
}
getKnownList().getKnownObjects().values().stream().filter(PlayerInstance.class::isInstance).map(PlayerInstance.class::cast).forEach(player ->
for (WorldObject obj : getKnownList().getKnownObjects().values())
{
for (DeleteObject deleteObject : deleteObjects)
if ((obj != null) && obj.isPlayer())
{
player.sendPacket(deleteObject);
for (DeleteObject deleteObject : deleteObjects)
{
obj.getActingPlayer().sendPacket(deleteObject);
}
}
});
}
}
decayMe();
FenceData.getInstance().removeFence(this);
return false;
}
@ -113,7 +115,13 @@ public class FenceInstance extends WorldObject
public void setState(FenceState type)
{
_state = type;
getKnownList().getKnownObjects().values().stream().filter(PlayerInstance.class::isInstance).map(PlayerInstance.class::cast).forEach(this::sendInfo);
for (WorldObject obj : getKnownList().getKnownObjects().values())
{
if ((obj != null) && obj.isPlayer())
{
sendInfo(obj.getActingPlayer());
}
}
}
public int getWidth()

View File

@ -30,7 +30,6 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.l2jmobius.Config;
import org.l2jmobius.commons.database.DatabaseFactory;
@ -1354,7 +1353,16 @@ public class Quest extends ManagedScript
return (checkPlayerCondition(player, npc, var, value) != null) ? Arrays.asList(player) : Collections.emptyList();
}
return party.getPartyMembers().stream().filter(m -> checkPlayerCondition(m, npc, var, value) != null).collect(Collectors.toList());
final List<PlayerInstance> result = new ArrayList<>();
for (PlayerInstance member : party.getPartyMembers())
{
if (checkPlayerCondition(member, npc, var, value) != null)
{
result.add(member);
}
}
return result;
}
/**
@ -1481,7 +1489,16 @@ public class Quest extends ManagedScript
return (checkPlayerState(player, npc, state) != null) ? Arrays.asList(player) : Collections.emptyList();
}
return party.getPartyMembers().stream().filter(m -> checkPlayerState(m, npc, state) != null).collect(Collectors.toList());
final List<PlayerInstance> result = new ArrayList<>();
for (PlayerInstance member : party.getPartyMembers())
{
if (checkPlayerState(member, npc, state) != null)
{
result.add(member);
}
}
return result;
}
/**