diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 3e779357a4..3411258318 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -307,17 +307,13 @@ public abstract class MinecraftServer implements Runnable, IMojangStatistics, IC
                         log.info("Saving chunks for level \'" + worldserver.getWorldData().getName() + "\'/" + worldserver.worldProvider);
                     }
 
-                    worldserver.save(true, (IProgressUpdate) null);
+                    worldserver.save(false, (IProgressUpdate) null); // Queue chunk saving
                     worldserver.saveLevel();
 
                     WorldSaveEvent event = new WorldSaveEvent(worldserver.getWorld());
                     this.server.getPluginManager().callEvent(event);
                 }
             }
-
-            if (!this.worlds.get(0).savingDisabled) {
-                this.getServerConfigurationManager().savePlayers();
-            }
             // CraftBukkit end
         }
     }