diff --git a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
index 7302b5e..5a7bf68 100644
--- a/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/world/gen/ChunkProviderServer.java
@@ -204,9 +204,10 @@
 				{
 					try
 					{
+						boolean lastIsGenerating = isGenerating;
 						isGenerating = true;
 						chunk = this.currentChunkProvider.provideChunk(par1, par2);
-						isGenerating = false;
+						isGenerating = lastIsGenerating;
 					}
 					catch (Throwable throwable)
 					{
@@ -311,12 +312,13 @@
 
 			if (this.currentChunkProvider != null)
 			{
+				boolean lastIsGenerating = isGenerating;
 				isGenerating = true;
 				this.currentChunkProvider.populate(par1IChunkProvider, par2, par3);
 				if(!worldObj.getConfig().generation.disableModGeneration)
 					GameRegistry.generateWorld(par2, par3, worldObj, currentChunkProvider, par1IChunkProvider);
 				chunk.setChunkModified();
-				isGenerating = false;
+				isGenerating = lastIsGenerating;
 			}
 		}
 	}