Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-30 14:43:54 +01:00
Code Issues Projects Releases Wiki Activity

Reorder highest/lowest calculations - may fix issues with using remove()

Browse Source
This commit is contained in:
fullwall 2013-09-10 23:55:58 +08:00
parent c25a747500
commit 50a43d6116
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/net/citizensnpcs/util/ByIdArray.java
View File

@ -107,16 +107,15 @@ public class ByIdArray<T> implements Iterable<T> {
public T remove(int index) { public T remove(int index) {
if (index > elementData.length || elementData[index] == null) if (index > elementData.length || elementData[index] == null)
return null; return null;
@SuppressWarnings("unchecked")
T prev = (T) elementData[index];
elementData[index] = null;
--size;
++modCount; ++modCount;
if (index == highest) if (index == highest)
recalcHighest(); recalcHighest();
if (index == lowest) if (index == lowest)
recalcLowest(); recalcLowest();
@SuppressWarnings("unchecked")
T prev = (T) elementData[index];
elementData[index] = null;
if (prev != null)
--size;
return prev; return prev;
} }
@ -125,9 +124,10 @@ public class ByIdArray<T> implements Iterable<T> {
} }
public void trimToSize() { public void trimToSize() {
if (elementData.length > highest) if (elementData.length > highest) {
elementData = Arrays.copyOf(elementData, highest + 1); elementData = Arrays.copyOf(elementData, highest + 1);
} }
}
private class Itr implements Iterator<T> { private class Itr implements Iterator<T> {
private int expected = ByIdArray.this.modCount; private int expected = ByIdArray.this.modCount;