Partially revert last change - behaviour should now hopefully somewhe…

…re in between with mob counts
MinimallyCorrect · Jun 4, 2017 · a54fd91 · a54fd91
1 parent 51646c5
commit a54fd91
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/org/minimallycorrect/tickthreading/mixin/world/MixinWorldEntitySpawner.java b/src/main/java/org/minimallycorrect/tickthreading/mixin/world/MixinWorldEntitySpawner.java
@@ -162,7 +162,8 @@ public int findChunksForSpawning(WorldServer worldServer, boolean peaceful, bool
 		SpawnLoop:
 		for (val entry : requiredSpawns.entrySet()) {
 			val creatureType = entry.getKey();
-			for (int j = 0; j < triesPerCreatureType; j++) {
+			val tries = Math.max(triesPerCreatureType, entry.getValue() / (triesPerCreatureType * mobClumping));
+			for (int j = 0; j < tries; j++) {
 				long hash = spawnableChunks.get(worldServer.rand.nextInt(size));
 				int x = (int) (hash >> 32);
 				int z = (int) hash;
@@ -208,7 +209,7 @@ public int findChunksForSpawning(WorldServer worldServer, boolean peaceful, bool
 							if (ssY <= 0)
 								continue;
 							state = chunk.getBlockState(ssX, ssY - 1, ssZ);
-							if (!state.getMaterial().isOpaque() || !state.getBlock().canCreatureSpawn(state, worldServer, new BlockPos(ssX, ssY - 1, ssZ), null))
+							if (!state.getBlock().canCreatureSpawn(state, worldServer, new BlockPos(ssX, ssY - 1, ssZ), null))
 								continue;
 						}