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

Minor changes

Browse Source
This commit is contained in:
fullwall 2012-04-24 14:17:16 +08:00
parent f358dfc548
commit 391b35d0f7
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,26 +132,29 @@ public class ByIdArray<T> implements Iterable<T> {
private int expected = ByIdArray.this.modCount;
private int idx;
{
if (lowest == Integer.MAX_VALUE || elementData[lowest] == null) {
recalcLowest();
}
idx = lowest;
if (elementData[lowest] == null) {
Messaging.log("lowest is still null!");
if (size > 0) {
if (highest == Integer.MIN_VALUE || elementData[highest] == null)
recalcHighest();
if (lowest == Integer.MAX_VALUE || elementData[lowest] == null)
recalcLowest();
idx = lowest;
if (elementData[lowest] == null) {
Messaging.log("lowest is still null!");
}
}
}
@Override
public boolean hasNext() {
if (ByIdArray.this.modCount != expected)
if (modCount != expected)
throw new ConcurrentModificationException();
return highest + 1 > idx && size > 0;
return size > 0 && highest + 1 > idx;
}
@Override
@SuppressWarnings("unchecked")
public T next() {
if (ByIdArray.this.modCount != expected)
if (modCount != expected)
throw new ConcurrentModificationException();
T next = (T) elementData[idx];
if (next == null || idx > highest)
@ -164,10 +167,10 @@ public class ByIdArray<T> implements Iterable<T> {
@Override
public void remove() {
if (ByIdArray.this.modCount != expected)
if (modCount != expected)
throw new ConcurrentModificationException();
ByIdArray.this.fastRemove(idx);
expected = ByIdArray.this.modCount;
fastRemove(idx);
expected = modCount;
}
}