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

Fix item sort deadlock (#319)

Browse Source
This commit is contained in:
MedicOP
2019-01-13 01:14:10 +01:00
committed by Ronan Lana
parent 08e7ef3f66
commit 51211cfb1e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/net/server/channel/handlers/InventorySortHandler.java
View File

@@ -117,7 +117,7 @@ class PairedQuicksort {
} }
private void PartitionByLevel(int Esq, int Dir, ArrayList<Item> A) { private void PartitionByLevel(int Esq, int Dir, ArrayList<Item> A) {
Equip x, w, eqpI, eqpJ; Equip x, w;
i = Esq; i = Esq;
j = Dir; j = Dir;
@@ -125,11 +125,9 @@ class PairedQuicksort {
x = (Equip)(A.get((i + j) / 2)); x = (Equip)(A.get((i + j) / 2));
do { do {
eqpI = (Equip)A.get(i);
eqpJ = (Equip)A.get(j);
while (x.getLevel() > eqpI.getLevel()) i++; while (x.getLevel() > ((Equip)A.get(i)).getLevel()) i++;
while (x.getLevel() < eqpJ.getLevel()) j--; while (x.getLevel() < ((Equip)A.get(j)).getLevel()) j--;
if (i <= j) { if (i <= j) {
w = (Equip)A.get(i); w = (Equip)A.get(i);