Upstream
/
CaveBlock
mirror of https://github.com/BentoBoxWorld/CaveBlock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

getMinHeight and getMaxHeight for populators too

This commit is contained in:
Huynh Tien 2021-11-10 08:33:13 +07:00
parent c5742942f9
commit 283fa48f61
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/world/bentobox/caveblock/generators/populators/EntitiesPopulator.java
View File

@ -67,14 +67,17 @@ public class EntitiesPopulator extends BlockPopulator
@Override
public void populate(World world, Random random, Chunk chunk)
{
int minHeight = world.getMinHeight();
int height = Math.min(world.getMaxHeight() - 1, worldHeight);
for (Map.Entry<EntityType, Pair<Double, Integer>> entry : chances.get(world.getEnvironment()).entityChanceMap.entrySet())
{
for (int subY = 0; subY < worldHeight; subY += 16)
for (int subY = minHeight; subY < height; subY += 16)
{
// Use double so chance can be < 1
if (random.nextDouble() * 100 < entry.getValue().x)
{
int y = Math.min(worldHeight - 2, subY + random.nextInt(15));
int y = Math.min(height - 2, subY + random.nextInt(15));
// Spawn only in middle of chunk because bounding box will grow out from here
this.tryToPlaceEntity(world, chunk.getBlock(7, y, 7), entry.getKey(), chances.get(world.getEnvironment()).mainMaterial);
}

8
src/main/java/world/bentobox/caveblock/generators/populators/MaterialPopulator.java
View File

@ -62,11 +62,13 @@ public class MaterialPopulator extends BlockPopulator
@Override
public void populate(World world, Random random, Chunk chunk)
{
int minHeight = world.getMinHeight();
int height = Math.min(world.getMaxHeight() - 1, worldHeight);
Chances chances = this.chances.get(world.getEnvironment());
for (Map.Entry<Material, Pair<Double, Integer>> entry : chances.materialChanceMap.entrySet())
{
for (int subY = 1; subY < worldHeight; subY += 16)
for (int subY = minHeight + 1; subY < height; subY += 16)
{
if (random.nextDouble() * 100 < entry.getValue().x)
{
@ -74,7 +76,7 @@ public class MaterialPopulator extends BlockPopulator
// Blocks must be 1 away from edge to avoid adjacent chunk loading
int x = random.nextInt(13) + 1;
int z = random.nextInt(13) + 1;
int y = Math.min(worldHeight - 2, subY + random.nextInt(15));
int y = Math.min(height - 2, subY + random.nextInt(15));
/*
* TODO: remove
if (addon.getSettings().isDebug()) {
@ -105,7 +107,7 @@ public class MaterialPopulator extends BlockPopulator
x = Math.min(15, x + 1);
break;
case 1:
y = Math.min(worldHeight - 2, y + 1);
y = Math.min(height - 2, y + 1);
break;
case 2:
z = Math.min(15, z + 1);