diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 0c93d48..cf12421 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -243,6 +243,7 @@
 
 	protected void initialWorldChunkLoad()
 	{
+		/*
 		boolean flag = true;
 		boolean flag1 = true;
 		boolean flag2 = true;
@@ -271,7 +272,7 @@
 				worldserver.theChunkProviderServer.loadChunk(chunkcoordinates.posX + k >> 4, chunkcoordinates.posZ + l >> 4);
 			}
 		}
-
+		*/
 		this.clearCurrentTask();
 	}
 
diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
index 21c5e91..a30e8ca 100644
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
@@ -76,22 +76,7 @@
 
 	public void unloadChunksIfNotNearSpawn(int par1, int par2)
 	{
-		if (this.worldObj.provider.canRespawnHere() && DimensionManager.shouldLoadSpawn(this.worldObj.provider.dimensionId))
-		{
-			ChunkCoordinates chunkcoordinates = this.worldObj.getSpawnPoint();
-			int k = par1 * 16 + 8 - chunkcoordinates.posX;
-			int l = par2 * 16 + 8 - chunkcoordinates.posZ;
-			short short1 = 128;
-
-			if (k < -short1 || k > short1 || l < -short1 || l > short1)
-			{
-				this.chunksToUnload.add(ChunkHash.chunkToKey(par1, par2));
-			}
-		}
-		else
-		{
-			this.chunksToUnload.add(ChunkHash.chunkToKey(par1, par2));
-		}
+		this.chunksToUnload.add(ChunkHash.chunkToKey(par1, par2));
 	}
 
 	public void unloadAllChunks()