more chunk fixes

src/main/java/net/minecraft/server/ChunkProviderServer.java

@@ -196,8 +196,7 @@ public class ChunkProviderServer implements IChunkProvider {
 
     public boolean a() {
         if (!this.g.C) {
-            for (int i = 0; i < 100; ++i) {
+            while (!this.a.isEmpty()) {
-                if (!this.a.isEmpty()) {
                 // CraftBukkit start
                 long chunkcoordinates = this.a.popFirst();
                 Chunk chunk = e.get(chunkcoordinates);
@@ -210,7 +209,6 @@ public class ChunkProviderServer implements IChunkProvider {
                 this.e.remove(chunkcoordinates);
                 this.f.remove(chunk);
             }
-            }
 
             if (this.d != null) {
                 this.d.a();

src/main/java/net/minecraft/server/LongHashset.java

@@ -32,7 +32,7 @@ public class LongHashset<V> extends LongHash<V> {
                     return;
                 }
             }
-            outer[0] = inner = Arrays.copyOf(inner, i+1);
+            outer[outerIdx] = inner = Arrays.copyOf(inner, i+1);
             inner[i] = key;
             count++;
         }
@@ -82,7 +82,9 @@ public class LongHashset<V> extends LongHash<V> {
                 count--;
                 long ret = inner[inner.length - 1];
                 outer[i] = Arrays.copyOf(inner, inner.length - 1);
+                System.err.println("Removing chunk (" + msw(ret) + ", " + lsw(ret) + ")");
                 return ret;
+                
             }
         }
         return 0;