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

CitizensDev · Sep 10, 2013 · c7a576d · c7a576d
1 parent c99825e
commit c7a576d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/net/citizensnpcs/util/ByIdArray.java b/src/main/java/net/citizensnpcs/util/ByIdArray.java
@@ -107,16 +107,15 @@ private void recalcLowest() {
     public T remove(int index) {
         if (index > elementData.length || elementData[index] == null)
             return null;
+        @SuppressWarnings("unchecked")
+        T prev = (T) elementData[index];
+        elementData[index] = null;
+        --size;
         ++modCount;
         if (index == highest)
             recalcHighest();
         if (index == lowest)
             recalcLowest();
-        @SuppressWarnings("unchecked")
-        T prev = (T) elementData[index];
-        elementData[index] = null;
-        if (prev != null)
-            --size;
         return prev;
     }
 
@@ -125,8 +124,9 @@ public int size() {
     }
 
     public void trimToSize() {
-        if (elementData.length > highest)
+        if (elementData.length > highest) {
             elementData = Arrays.copyOf(elementData, highest + 1);
+        }
     }
 
     private class Itr implements Iterator<T> {