Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: prefer List#sort over Collections#sort

Browse Source
This commit is contained in:
P0nk
2021-04-08 07:44:02 +02:00
parent 5730b3b42d
commit ebb3aa7ba3
14 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/server/MapleStorage.java
View File

@@ -233,7 +233,7 @@ public class MapleStorage {
lock.lock();
try {
Collections.sort(items, (o1, o2) -> {
items.sort((o1, o2) -> {
if (o1.getInventoryType().getType() < o2.getInventoryType().getType()) {
return -1;
} else if (o1.getInventoryType() == o2.getInventoryType()) {

3
src/main/java/server/life/positioner/MaplePlayerNPCPodium.java
View File

@@ -31,7 +31,6 @@ import tools.MaplePacketCreator;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
@@ -92,7 +91,7 @@ public class MaplePlayerNPCPodium {
playerNpcs.add((MaplePlayerNPC) mmo);
}
Collections.sort(playerNpcs, (p1, p2) -> {
playerNpcs.sort((p1, p2) -> {
return p1.getScriptId() - p2.getScriptId(); // scriptid as playernpc history
});

6
src/main/java/server/life/positioner/MaplePlayerNPCPositioner.java
View File

@@ -29,8 +29,10 @@ import server.maps.MapleMapObjectType;
import tools.MaplePacketCreator;
import java.awt.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import java.util.*;
/**
*
@@ -141,7 +143,7 @@ public class MaplePlayerNPCPositioner {
playerNpcs.add((MaplePlayerNPC) mmo);
}
Collections.sort(playerNpcs, (p1, p2) -> {
playerNpcs.sort((p1, p2) -> {
return p1.getScriptId() - p2.getScriptId(); // scriptid as playernpc history
});

2
src/main/java/server/quest/actions/ItemAction.java
View File

@@ -79,7 +79,7 @@ public class ItemAction extends MapleQuestAction {
items.add(new ItemData(Integer.parseInt(iEntry.getName()), id, count, prop, job, gender, period));
}
Collections.sort(items, (o1, o2) -> o1.map - o2.map);
items.sort((o1, o2) -> o1.map - o2.map);
}
@Override