1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
index 29fb40d2..843761a5 100644
--- a/src/main/java/net/minecraft/server/WorldServer.java
+++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -9,6 +9,7 @@ import java.util.Random;
 import java.util.Set;
 import java.util.TreeSet;
 
+import net.minecraft.util.com.google.common.collect.Lists;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -765,14 +766,14 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
             }
 
             this.chunkProvider.saveChunks(flag, iprogressupdate);
-            // CraftBukkit - List -> Collection
-            Collection list = this.chunkProviderServer.a();
-            Iterator iterator = list.iterator();
+            // CraftBukkit - ArrayList -> Collection
+            Collection arraylist = this.chunkProviderServer.a();
+            Iterator iterator = arraylist.iterator();
 
             while (iterator.hasNext()) {
                 Chunk chunk = (Chunk) iterator.next();
 
-                if (!this.manager.a(chunk.locX, chunk.locZ)) {
+                if (chunk != null && !this.manager.a(chunk.locX, chunk.locZ)) {
                     this.chunkProviderServer.queueUnload(chunk.locX, chunk.locZ);
                 }
             }
@@ -787,7 +788,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
 
     protected void a() throws ExceptionWorldConflict { // CraftBukkit - added throws
         this.G();
-        this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().q());
+        this.dataManager.saveWorldData(this.worldData, this.server.getPlayerList().t());
         // CraftBukkit start - save worldMaps once, rather than once per shared world
         if (!(this instanceof SecondaryWorldServer)) {
             this.worldMaps.a();
@@ -961,7 +962,7 @@ public class WorldServer extends World implements org.bukkit.BlockChangeDelegate
     }
 
     protected int p() {
-        return this.server.getPlayerList().o();
+        return this.server.getPlayerList().s();
     }
 
     public MinecraftServer getMinecraftServer() {