mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 02:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
cyberpwn 2022-01-15 08:50:39 -05:00
commit ccd05c04a5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java
View File

@ -68,7 +68,7 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
return;
}
if(yy >= 256 || yy <= 0) { // Yes, skip bedrock
if(yy >= getEngine().getWorld().maxHeight() - getEngine().getWorld().minHeight() || yy <= 0) { // Yes, skip bedrock
return;
}
@ -110,7 +110,11 @@ public class IrisCarveModifier extends EngineAssignedModifier<BlockData> {
} else if(c.isLava()) {
output.set(rx, yy, rz, LAVA);
} else {
output.set(rx, yy, rz, AIR);
if(getEngine().getDimension().getCaveLavaHeight() > yy){
output.set(rx, yy, rz, LAVA);
} else {
output.set(rx, yy, rz, AIR);
}
}
};

4
src/main/java/com/volmit/iris/engine/object/IrisDimension.java
View File

@ -230,8 +230,8 @@ public class IrisDimension extends IrisRegistrant {
private KList<IrisOreGenerator> ores = new KList<>();
@MinNumber(0)
@MaxNumber(318)
@Desc("The rock zoom mostly for zooming in on a wispy palette")
private int lavaLayer = 25;
@Desc("The Subterrain Fluid Layer Height")
private int caveLavaHeight = 8;
public int getMaxHeight() {
return 320;