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

Removed stream usage from WorldExchangeManager.

Browse Source
This commit is contained in:
MobiusDevelopment 2023-01-08 20:50:38 +00:00
parent d04663dce0
commit a9908e13cc
3 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
@ -814,17 +813,17 @@ public class WorldExchangeManager implements IXmlReader
*/
private List<WorldExchangeHolder> sortList(List<WorldExchangeHolder> unsortedList, WorldExchangeSortType sortType, String lang)
{
List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
final List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
switch (sortType)
{
case PRICE_ASCE:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
break;
}
case PRICE_DESC:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
Collections.reverse(sortedList);
break;
}
@ -832,11 +831,11 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> o.getItemInstance().getItemName())).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> o.getItemInstance().getItemName()));
}
break;
}
@ -844,23 +843,23 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> o.getItemInstance().getItemName())).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> o.getItemInstance().getItemName()));
}
Collections.reverse(sortedList);
break;
}
case PRICE_PER_PIECE_ASCE:
{
sortedList = sortedList.stream().sorted(Comparator.comparingLong(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparingLong(WorldExchangeHolder::getPrice));
break;
}
case PRICE_PER_PIECE_DESC:
{
sortedList = sortedList.stream().sorted(Comparator.comparingLong(WorldExchangeHolder::getPrice).reversed()).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparingLong(WorldExchangeHolder::getPrice).reversed());
break;
}
}

17
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
@ -820,17 +819,17 @@ public class WorldExchangeManager implements IXmlReader
*/
private List<WorldExchangeHolder> sortList(List<WorldExchangeHolder> unsortedList, WorldExchangeSortType sortType, String lang)
{
List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
final List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
switch (sortType)
{
case PRICE_ASCE:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
break;
}
case PRICE_DESC:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
Collections.reverse(sortedList);
break;
}
@ -838,11 +837,11 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> ((o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> (o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()));
}
break;
}
@ -850,11 +849,11 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> ((o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> (o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()));
}
Collections.reverse(sortedList);
break;
@ -980,7 +979,7 @@ public class WorldExchangeManager implements IXmlReader
public void storeMe()
{
if (!Config.WORLD_EXCHANGE_LAZY_UPDATE)
if (!Config.ENABLE_WORLD_EXCHANGE || !Config.WORLD_EXCHANGE_LAZY_UPDATE)
{
return;
}

19
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/instancemanager/WorldExchangeManager.java
View File

@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.stream.Collectors;
import org.w3c.dom.Document;
@ -820,17 +819,17 @@ public class WorldExchangeManager implements IXmlReader
*/
private List<WorldExchangeHolder> sortList(List<WorldExchangeHolder> unsortedList, WorldExchangeSortType sortType, String lang)
{
List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
final List<WorldExchangeHolder> sortedList = new ArrayList<>(unsortedList);
switch (sortType)
{
case PRICE_ASCE:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
break;
}
case PRICE_DESC:
{
sortedList = sortedList.stream().sorted(Comparator.comparing(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(WorldExchangeHolder::getPrice));
Collections.reverse(sortedList);
break;
}
@ -838,11 +837,11 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> ((o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> (o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()));
}
break;
}
@ -850,23 +849,23 @@ public class WorldExchangeManager implements IXmlReader
{
if ((lang == null) || (!lang.equals("en") && _localItemNames.containsKey(lang)))
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> getItemName(lang, o.getItemInstance().getId(), o.getItemInstance().isBlessed())));
}
else
{
sortedList = sortedList.stream().sorted(Comparator.comparing(o -> ((o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()))).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparing(o -> (o.getItemInstance().isBlessed() ? "Blessed " : "") + o.getItemInstance().getItemName()));
}
Collections.reverse(sortedList);
break;
}
case PRICE_PER_PIECE_ASCE:
{
sortedList = sortedList.stream().sorted(Comparator.comparingLong(WorldExchangeHolder::getPrice)).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparingLong(WorldExchangeHolder::getPrice));
break;
}
case PRICE_PER_PIECE_DESC:
{
sortedList = sortedList.stream().sorted(Comparator.comparingLong(WorldExchangeHolder::getPrice).reversed()).collect(Collectors.toList());
Collections.sort(sortedList, Comparator.comparingLong(WorldExchangeHolder::getPrice).reversed());
break;
}
}