Merge branch 'master' into PerWorldThreads

2013-08-12 07:46:41 +02:00
parent 829cc866cd d23b8e0c7c
commit 79ece8eb0d
5 changed files with 27 additions and 18 deletions
--- a/source/World.cpp
+++ b/source/World.cpp
@@ -744,6 +744,13 @@ void cWorld::TickSpawnMobs(float a_Dt)
 				case 6: MobType = E_ENTITY_TYPE_ZOMBIE_PIGMAN; break;
 			}
 		}
+		else if (GetBiomeAt((int)SpawnPos.x, (int)SpawnPos.z) == biSky) 
+		{
+			switch (nightRand)
+			{
+				case 5: MobType = E_ENTITY_TYPE_ENDERMAN;         break;
+			}
+		}
 		else
 		{
 			switch (nightRand)